database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-06 07:49:08 +03:00
Code Activity

Revert 019_replslot_limit.pl related debugging aids.

Browse Source 
This reverts most of 91c0570a79, f28bf667f6, fe0972ee5e, afdeff1052. The
only thing left is the retry loop in 019_replslot_limit.pl that avoids
spurious failures by retrying a couple times.

We haven't seen any hard evidence that this is caused by anything but slow
process shutdown. We did not find any cases where walsenders did not vanish
after waiting for longer. Therefore there's no reason for this debugging code
to remain.

Discussion: https://postgr.es/m/20220530190155.47wr3x2prdwyciah@alap3.anarazel.de
Backpatch: 15-
This commit is contained in:
Andres Freund
2022-07-05 11:01:10 -07:00
parent db1fff1ea4
commit 49ddd98763
6 changed files with 5 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,10 +177,6 @@ ReplicationSlotInitialize(void)
static void
ReplicationSlotShmemExit(int code, Datum arg)
{
/* temp debugging aid to analyze 019_replslot_limit failures */
elog(DEBUG3, "replication slot exit hook, %s active slot",
MyReplicationSlot != NULL ? "with" : "without");
/* Make sure active replication slots are released */
if (MyReplicationSlot != NULL)
ReplicationSlotRelease();
@@ -582,9 +578,6 @@ ReplicationSlotCleanup(void)
Assert(MyReplicationSlot == NULL);
restart:
/* temp debugging aid to analyze 019_replslot_limit failures */
elog(DEBUG3, "temporary replication slot cleanup: begin");
LWLockAcquire(ReplicationSlotControlLock, LW_SHARED);
for (i = 0; i < max_replication_slots; i++)
{
@@ -593,10 +586,6 @@ restart:
if (!s->in_use)
continue;
/* unlocked read of active_pid is ok for debugging purposes */
elog(DEBUG3, "temporary replication slot cleanup: %d in use, active_pid: %d",
i, (int) s->active_pid);
SpinLockAcquire(&s->mutex);
if (s->active_pid == MyProcPid)
{
@@ -614,8 +603,6 @@ restart:
}
LWLockRelease(ReplicationSlotControlLock);
elog(DEBUG3, "temporary replication slot cleanup: done");
}
/*
@@ -657,9 +644,6 @@ ReplicationSlotDropPtr(ReplicationSlot *slot)
char path[MAXPGPATH];
char tmppath[MAXPGPATH];
/* temp debugging aid to analyze 019_replslot_limit failures */
elog(DEBUG3, "replication slot drop: %s: begin", NameStr(slot->data.name));
/*
* If some other backend ran this code concurrently with us, we might try
* to delete a slot with a certain name while someone else was trying to
@@ -710,9 +694,6 @@ ReplicationSlotDropPtr(ReplicationSlot *slot)
path, tmppath)));
}
elog(DEBUG3, "replication slot drop: %s: removed on-disk",
NameStr(slot->data.name));
/*
* The slot is definitely gone. Lock out concurrent scans of the array
* long enough to kill it. It's OK to clear the active PID here without
@@ -726,13 +707,8 @@ ReplicationSlotDropPtr(ReplicationSlot *slot)
slot->active_pid = 0;
slot->in_use = false;
LWLockRelease(ReplicationSlotControlLock);
elog(DEBUG3, "replication slot drop: %s: marked as not in use", NameStr(slot->data.name));
ConditionVariableBroadcast(&slot->active_cv);
elog(DEBUG3, "replication slot drop: %s: notified others", NameStr(slot->data.name));
/*
* Slot is dead and doesn't prevent resource removal anymore, recompute
* limits.
@@ -740,8 +716,6 @@ ReplicationSlotDropPtr(ReplicationSlot *slot)
ReplicationSlotsComputeRequiredXmin(false);
ReplicationSlotsComputeRequiredLSN();
elog(DEBUG3, "replication slot drop: %s: computed required", NameStr(slot->data.name));
/*
* If removing the directory fails, the worst thing that will happen is
* that the user won't be able to create a new slot with the same name
@@ -751,8 +725,6 @@ ReplicationSlotDropPtr(ReplicationSlot *slot)
ereport(WARNING,
(errmsg("could not remove directory \"%s\"", tmppath)));
elog(DEBUG3, "replication slot drop: %s: removed directory", NameStr(slot->data.name));
/*
* Drop the statistics entry for the replication slot. Do this while
* holding ReplicationSlotAllocationLock so that we don't drop a
@@ -767,9 +739,6 @@ ReplicationSlotDropPtr(ReplicationSlot *slot)
* a slot while we're still cleaning up the detritus of the old one.
*/
LWLockRelease(ReplicationSlotAllocationLock);
elog(DEBUG3, "replication slot drop: %s: done",
NameStr(slot->data.name));
}
/*
@@ -1329,12 +1298,6 @@ InvalidatePossiblyObsoleteSlot(ReplicationSlot *s, XLogRecPtr oldestLSN,
(void) kill(active_pid, SIGTERM);
last_signaled_pid = active_pid;
}
else
{
/* temp debugging aid to analyze 019_replslot_limit failures */
elog(DEBUG3, "not signalling process %d during invalidation of slot \"%s\"",
active_pid, NameStr(slotname));
}
/* Wait until the slot is released. */
ConditionVariableSleep(&s->active_cv,
@@ -1398,10 +1361,6 @@ InvalidateObsoleteReplicationSlots(XLogSegNo oldestSegno)
XLogSegNoOffsetToRecPtr(oldestSegno, 0, wal_segment_size, oldestLSN);
restart:
/* temp debugging aid to analyze 019_replslot_limit failures */
elog(DEBUG3, "begin invalidating obsolete replication slots older than %X/%X",
LSN_FORMAT_ARGS(oldestLSN));
LWLockAcquire(ReplicationSlotControlLock, LW_SHARED);
for (int i = 0; i < max_replication_slots; i++)
{
@@ -1427,8 +1386,6 @@ restart:
ReplicationSlotsComputeRequiredLSN();
}
elog(DEBUG3, "done invalidating obsolete replication slots");
return invalidated;
}