Fix handling of synchronous replication for stopping WAL senders

This fixes an oversight from c6c3334 which forgot that if a subset of
WAL senders are stopping and in a sync state, other WAL senders could
still be waiting for a WAL position to be synced while committing a
transaction.  However the subset of stopping senders would not release
waiters, potentially breaking synchronous replication guarantees.  This
commit makes sure that even WAL senders stopping are able to release
waiters and are tracked properly.

On 9.4, this can also trigger an assertion failure when setting for
example max_wal_senders to 1 where a WAL sender is not able to find
itself as in synchronous state when the instance stops.

Reported-by: Paul Guo
Author: Paul Guo, Michael Paquier
Discussion: https://postgr.es/m/CAEET0ZEv8VFqT3C-cQm6byOB4r4VYWcef1J21dOX-gcVhCSpmA@mail.gmail.com
Backpatch-through: 9.4

diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c
index 9a13c50ce88179d6202fb8f018a6ae1aa07fe54a..5b8a268fa16cf74618c70d495394c77ef278faa1 100644 (file)
--- a/src/backend/replication/syncrep.c
+++ b/src/backend/replication/syncrep.c
@@ -425,10 +425,12 @@ SyncRepReleaseWaiters(void)
         * If this WALSender is serving a standby that is not on the list of
         * potential sync standbys then we have nothing to do. If we are still
         * starting up, still running base backup or the current flush position is
-        * still invalid, then leave quickly also.
+        * still invalid, then leave quickly also.  Streaming or stopping WAL
+        * senders are allowed to release waiters.
         */
        if (MyWalSnd->sync_standby_priority == 0 ||
-               MyWalSnd->state < WALSNDSTATE_STREAMING ||
+               (MyWalSnd->state != WALSNDSTATE_STREAMING &&
+                MyWalSnd->state != WALSNDSTATE_STOPPING) ||
                XLogRecPtrIsInvalid(MyWalSnd->flush))
        {
                announce_next_takeover = true;
@@ -730,8 +732,9 @@ SyncRepGetSyncStandbysQuorum(bool *am_sync)
                if (pid == 0)
                        continue;
 
-               /* Must be streaming */
-               if (state != WALSNDSTATE_STREAMING)
+               /* Must be streaming or stopping */
+               if (state != WALSNDSTATE_STREAMING &&
+                       state != WALSNDSTATE_STOPPING)
                        continue;
 
                /* Must be synchronous */
@@ -809,8 +812,9 @@ SyncRepGetSyncStandbysPriority(bool *am_sync)
                if (pid == 0)
                        continue;
 
-               /* Must be streaming */
-               if (state != WALSNDSTATE_STREAMING)
+               /* Must be streaming or stopping */
+               if (state != WALSNDSTATE_STREAMING &&
+                       state != WALSNDSTATE_STOPPING)
                        continue;
 
                /* Must be synchronous */