From 66ab58415f0e24c0a39f1f47837e7ccb6aff5da0 Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Wed, 6 Dec 2023 09:37:15 +0530 Subject: [PATCH v2] 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 --- src/backend/utils/adt/pg_upgrade_support.c | 10 +++++----- src/include/catalog/pg_proc.dat | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/backend/utils/adt/pg_upgrade_support.c b/src/backend/utils/adt/pg_upgrade_support.c index 2f6fc86c3d..d0beea3601 100644 --- a/src/backend/utils/adt/pg_upgrade_support.c +++ b/src/backend/utils/adt/pg_upgrade_support.c @@ -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); diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index fb58dee3bc..77e8b13764 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -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 -- 2.28.0.windows.1