Fix issues in binary_upgrade_logical_slot_has_caught_up().
The commit 29d0a77fa6
labelled binary_upgrade_logical_slot_has_caught_up()
as a non-strict function to allow providing a better error message to callers
in case the passed slot_name is NULL. On further discussion, it seems that
it is not helpful to have a different error message for NULL input in this
function, so this patch marks the function as strict.
This patch also removes the explicit permission check to use replication
slots as this function is invoked only by superusers and instead adds an
Assert.
Reported-by: Masahiko Sawada
Author: Hayato Kuroda
Reviewed-by: Vignesh C
Discussion: https://postgr.es/m/CAD21AoDSyiBKkMXBxN_gUayZZUCOgyHnG8Ge8rcPXNP3Tf6B4g@mail.gmail.com
This commit is contained in:
parent
c426f7c2b3
commit
0bf62460bb
|
@ -281,11 +281,11 @@ binary_upgrade_logical_slot_has_caught_up(PG_FUNCTION_ARGS)
|
|||
|
||||
CHECK_IS_BINARY_UPGRADE;
|
||||
|
||||
/* We must check before dereferencing the argument */
|
||||
if (PG_ARGISNULL(0))
|
||||
elog(ERROR, "null argument to binary_upgrade_validate_wal_records is not allowed");
|
||||
|
||||
CheckSlotPermissions();
|
||||
/*
|
||||
* Binary upgrades only allowed super-user connections so we must have
|
||||
* permission to use replication slots.
|
||||
*/
|
||||
Assert(has_rolreplication(GetUserId()));
|
||||
|
||||
slot_name = PG_GETARG_NAME(0);
|
||||
|
||||
|
|
|
@ -57,6 +57,6 @@
|
|||
*/
|
||||
|
||||
/* yyyymmddN */
|
||||
#define CATALOG_VERSION_NO 202311271
|
||||
#define CATALOG_VERSION_NO 202312071
|
||||
|
||||
#endif
|
||||
|
|
|
@ -11392,9 +11392,8 @@
|
|||
proparallel => 'u', prorettype => 'void', proargtypes => 'oid',
|
||||
prosrc => 'binary_upgrade_set_next_pg_tablespace_oid' },
|
||||
{ oid => '8046', descr => 'for use by pg_upgrade',
|
||||
proname => 'binary_upgrade_logical_slot_has_caught_up', proisstrict => 'f',
|
||||
provolatile => 'v', proparallel => 'u', prorettype => 'bool',
|
||||
proargtypes => 'name',
|
||||
proname => 'binary_upgrade_logical_slot_has_caught_up', provolatile => 'v',
|
||||
proparallel => 'u', prorettype => 'bool', proargtypes => 'name',
|
||||
prosrc => 'binary_upgrade_logical_slot_has_caught_up' },
|
||||
|
||||
# conversion functions
|
||||
|
|
Loading…
Reference in New Issue