diff --git a/src/backend/replication/logical/slotsync.c b/src/backend/replication/logical/slotsync.c index 96107c9475d..05637344363 100644 --- a/src/backend/replication/logical/slotsync.c +++ b/src/backend/replication/logical/slotsync.c @@ -541,6 +541,7 @@ drop_local_obsolete_slots(List *remote_slot_list) /* Drop the local slot if it is not required to be retained. */ if (!local_sync_slot_required(local_slot, remote_slot_list)) { + Oid slot_database = local_slot->data.database; bool synced_slot; /* @@ -548,8 +549,8 @@ drop_local_obsolete_slots(List *remote_slot_list) * ReplicationSlotsDropDBSlots(), trying to drop the same slot * during a drop-database operation. */ - LockSharedObject(DatabaseRelationId, local_slot->data.database, - 0, AccessShareLock); + LockSharedObject(DatabaseRelationId, slot_database, 0, + AccessShareLock); /* * In the small window between getting the slot to drop and @@ -566,23 +567,25 @@ drop_local_obsolete_slots(List *remote_slot_list) if (synced_slot) { + NameData slot_name = local_slot->data.name; + /* * Now acquire and drop the slot. Note we purposely don't * request logical decoding to be disabled here: since this is * a standby, which derives its logical decoding state from * the primary, it would be wrong to do so. */ - ReplicationSlotAcquire(NameStr(local_slot->data.name), true, false); + ReplicationSlotAcquire(NameStr(slot_name), true, false); ReplicationSlotDropAcquired(false); + + ereport(LOG, + errmsg("dropped replication slot \"%s\" of database with OID %u", + NameStr(slot_name), + slot_database)); } - UnlockSharedObject(DatabaseRelationId, local_slot->data.database, - 0, AccessShareLock); - - ereport(LOG, - errmsg("dropped replication slot \"%s\" of database with OID %u", - NameStr(local_slot->data.name), - local_slot->data.database)); + UnlockSharedObject(DatabaseRelationId, slot_database, 0, + AccessShareLock); } } }