database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-10-29 22:49:41 +03:00
Code Activity

Fix GUC check_hook validation for synchronized_standby_slots.

Browse Source 
Previously, the check_hook for synchronized_standby_slots attempted to
validate that each specified slot existed and was physical. However, these
checks were not performed during server startup. As a result, if users
configured non-existent slots before startup, the misconfiguration would
go undetected initially. This could later cause parallel query failures,
as newly launched workers would detect the issue and raise an ERROR.

This patch improves the check_hook by validating the syntax and format of
slot names. Validation of slot existence and type is deferred to the WAL
sender process, aligning with the behavior of the check_hook for
primary_slot_name.

Reported-by: Fabrice Chapuis <fabrice636861@gmail.com>
Author: Shlok Kyal <shlok.kyal.oss@gmail.com>
Reviewed-by: Hayato Kuroda <kuroda.hayato@fujitsu.com>
Reviewed-by: Amit Kapila <amit.kapila16@gmail.com>
Reviewed-by: Ashutosh Sharma <ashu.coek88@gmail.com>
Reviewed-by: Rahila Syed <rahilasyed90@gmail.com>
Backpatch-through: 17, where it was introduced
Discussion: https://postgr.es/m/CAA5-nLCeO4MQzWipCXH58qf0arruiw0OeUc1+Q=Z=4GM+=v1NQ@mail.gmail.com
This commit is contained in:
Amit Kapila
2025-10-27 06:34:29 +00:00
parent 0d30746153
commit 0024f5a102
3 changed files with 34 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/backend/replication/slot.c
View File

@@ -2468,53 +2468,32 @@ GetSlotInvalidationCause(const char *invalidation_reason)
static bool
validate_sync_standby_slots(char *rawname, List **elemlist)
{
bool ok;
/* Verify syntax and parse string into a list of identifiers */
ok = SplitIdentifierString(rawname, ',', elemlist);
if (!ok)
if (!SplitIdentifierString(rawname, ',', elemlist))
{
GUC_check_errdetail("List syntax is invalid.");
return false;
}
else if (MyProc)
/* Iterate the list to validate each slot name */
foreach_ptr(char, name, *elemlist)
{
/*
* Check that each specified slot exist and is physical.
*
* Because we need an LWLock, we cannot do this on processes without a
* PGPROC, so we skip it there; but see comments in
* StandbySlotsHaveCaughtup() as to why that's not a problem.
*/
LWLockAcquire(ReplicationSlotControlLock, LW_SHARED);
int err_code;
char *err_msg = NULL;
char *err_hint = NULL;
foreach_ptr(char, name, *elemlist)
if (!ReplicationSlotValidateNameInternal(name, &err_code, &err_msg,
&err_hint))
{
ReplicationSlot *slot;
slot = SearchNamedReplicationSlot(name, false);
if (!slot)
{
GUC_check_errdetail("replication slot \"%s\" does not exist",
name);
ok = false;
break;
}
if (!SlotIsPhysical(slot))
{
GUC_check_errdetail("\"%s\" is not a physical replication slot",
name);
ok = false;
break;
}
GUC_check_errcode(err_code);
GUC_check_errdetail("%s", err_msg);
if (err_hint != NULL)
GUC_check_errhint("%s", err_hint);
return false;
}
LWLockRelease(ReplicationSlotControlLock);
}
return ok;
return true;
}
/*
@@ -2672,12 +2651,6 @@ StandbySlotsHaveCaughtup(XLogRecPtr wait_for_lsn, int elevel)
/*
* If a slot name provided in synchronized_standby_slots does not
* exist, report a message and exit the loop.
*
* Though validate_sync_standby_slots (the GUC check_hook) tries to
* avoid this, it can nonetheless happen because the user can specify
* a nonexistent slot name before server startup. That function cannot
* validate such a slot during startup, as ReplicationSlotCtl is not
* initialized by then. Also, the user might have dropped one slot.
*/
if (!slot)
{

10
src/test/modules/unsafe_tests/expected/guc_privs.out
View File

@@ -581,6 +581,16 @@ DROP ROLE regress_host_resource_newadmin; -- ok, nothing was transferred
-- Use "drop owned by" so we can drop the role
DROP OWNED BY regress_host_resource_admin; -- ok
DROP ROLE regress_host_resource_admin; -- ok
-- Test for GUC synchronized standby slots
-- Cannot set synchronized_standby_slots to an invalid slot name
ALTER SYSTEM SET synchronized_standby_slots='invalid*';
ERROR: invalid value for parameter "synchronized_standby_slots": "invalid*"
DETAIL: replication slot name "invalid*" contains invalid character
HINT: Replication slot names may only contain lower case letters, numbers, and the underscore character.
-- Can set synchronized_standby_slots to a non-existent slot name
ALTER SYSTEM SET synchronized_standby_slots='missing';
-- Reset the GUC
ALTER SYSTEM RESET synchronized_standby_slots;
-- Clean up
RESET SESSION AUTHORIZATION;
DROP ROLE regress_admin; -- ok

8
src/test/modules/unsafe_tests/sql/guc_privs.sql
View File

@@ -262,6 +262,14 @@ DROP ROLE regress_host_resource_newadmin; -- ok, nothing was transferred
DROP OWNED BY regress_host_resource_admin; -- ok
DROP ROLE regress_host_resource_admin; -- ok
-- Test for GUC synchronized standby slots
-- Cannot set synchronized_standby_slots to an invalid slot name
ALTER SYSTEM SET synchronized_standby_slots='invalid*';
-- Can set synchronized_standby_slots to a non-existent slot name
ALTER SYSTEM SET synchronized_standby_slots='missing';
-- Reset the GUC
ALTER SYSTEM RESET synchronized_standby_slots;
-- Clean up
RESET SESSION AUTHORIZATION;
DROP ROLE regress_admin; -- ok