aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndres Freund <andres@anarazel.de>2017-08-24 15:21:32 -0700
committerAndres Freund <andres@anarazel.de>2017-08-24 15:21:32 -0700
commitb51c8efc6aff292912d8e77235eae8eef7ec909c (patch)
tree412f636ec06dcdae45b22e7ed21b4cdc7b931449
parentfe4c6582465719efc7534ae184fcc4b9dd6b1660 (diff)
downloadpostgresql-b51c8efc6aff292912d8e77235eae8eef7ec909c.tar.gz
postgresql-b51c8efc6aff292912d8e77235eae8eef7ec909c.zip
Fix bug that can cause walsender not to terminating at shutdown.
When backpatching c6c333436 I (Andres Freund) mis-resolved a conflict in the 9.4 branch. Unfortunately that leads to walsenders waiting forever when shutting down with connected standbys, unless immediate mode is used, or the standbys are forced to disconnect by other means. Author: Marco Nenciarini Reported-By: Abhijit Gharami, Marco Nenciarini Discussion: http://postgr.es/m/1434ad79-ab0d-d6a9-4ea2-1afb1c06adaf@2ndquadrant.it http://postgr.es/m/CAA5_DuD0O1XyM8OnOzhRepyPU-t8nZKLzs1pT2JpzP0NS+vVNA@mail.gmail.com Backpatch: 9.4 only
-rw-r--r--src/backend/replication/walsender.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index a0601b37074..b24f9a1e95b 100644
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -2658,6 +2658,7 @@ WalSndLastCycleHandler(SIGNAL_ARGS)
{
int save_errno = errno;
+ got_SIGUSR2 = true;
if (MyWalSnd)
SetLatch(&MyWalSnd->latch);