diff options
| author | Andres Freund <andres@anarazel.de> | 2022-02-14 16:44:28 -0800 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2022-02-14 17:08:17 -0800 |
| commit | 2f6501fa3c54bbe4568e3bcccd9a60d26a46b5ee (patch) | |
| tree | e1ced75463fc0cbb0de404d27d6227ecef1e5663 /src/backend/storage/lmgr/proc.c | |
| parent | b45fa793406d6007a787c586c1960b1ffc2ef2fb (diff) | |
| download | postgresql-2f6501fa3c54bbe4568e3bcccd9a60d26a46b5ee.tar.gz postgresql-2f6501fa3c54bbe4568e3bcccd9a60d26a46b5ee.zip | |
Move replication slot release to before_shmem_exit().
Previously, replication slots were released in ProcKill() on error, resulting
in reporting replication slot drop of ephemeral slots after the stats
subsystem was already shut down.
To fix this problem, move replication slot release to a before_shmem_exit()
hook that is called before the stats collector shuts down. There wasn't really
a good reason for the slot handling to be in ProcKill() anyway.
Patch by Masahiko Sawada, with very minor polishing by me.
I, Andres, wrote a test for dropping slots during process exit, but there may
be some OS dependent issues around the number of times FATAL error messages
are displayed due to a still debated libpq issue. So that test will be
committed separately / later.
Reviewed-By: Kyotaro Horiguchi <horikyota.ntt@gmail.com>
Reviewed-By: Andres Freund <andres@anarazel.de>
Author: Masahiko Sawada <sawada.mshk@gmail.com>
Discussion: https://postgr.es/m/CAD21AoDAeEpAbZEyYJsPZJUmSPaRicVSBObaL7sPaofnKz+9zg@mail.gmail.com
Diffstat (limited to 'src/backend/storage/lmgr/proc.c')
| -rw-r--r-- | src/backend/storage/lmgr/proc.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 37f032e7b95..90283f8a9f5 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -831,13 +831,6 @@ ProcKill(int code, Datum arg) /* Cancel any pending condition variable sleep, too */ ConditionVariableCancelSleep(); - /* Make sure active replication slots are released */ - if (MyReplicationSlot != NULL) - ReplicationSlotRelease(); - - /* Also cleanup all the temporary slots. */ - ReplicationSlotCleanup(); - /* * Detach from any lock group of which we are a member. If the leader * exist before all other group members, its PGPROC will remain allocated |