diff options
| -rw-r--r-- | src/backend/replication/walsender.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 7b44f9b0443..b6bf6333378 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -775,9 +775,20 @@ WalSndLoop(void) */ if (walsender_ready_to_stop) { + XLogRecPtr replicatedPtr; + /* ... let's just be real sure we're caught up ... */ XLogSend(output_message, &caughtup); - if (caughtup && XLByteEQ(sentPtr, MyWalSnd->flush) && + + /* + * Check a write location to see whether all the WAL have + * successfully been replicated if this walsender is connecting + * to a standby such as pg_receivexlog which always returns + * an invalid flush location. Otherwise, check a flush location. + */ + replicatedPtr = XLogRecPtrIsInvalid(MyWalSnd->flush) ? + MyWalSnd->write : MyWalSnd->flush; + if (caughtup && XLByteEQ(sentPtr, replicatedPtr) && !pq_is_send_pending()) { walsender_shutdown_requested = true; |