From aca27a0af5616bc1da4f08cbbc93b4d3c9380f60 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Mon, 23 Nov 2020 17:51:34 -0300 Subject: [PATCH] Don't loop forever in WalSndDone For a walsender that hasn't sent anything, the "replicatedPtr" as computed for shutdown is not valid, so the comparison to sentPtr fails. Make sure to only compare if replicatedPtr is valid. --- src/backend/replication/walsender.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index 5d1b1a16be..bb86c094a3 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -2936,7 +2936,8 @@ WalSndDone(WalSndSendDataCallback send_data) replicatedPtr = XLogRecPtrIsInvalid(MyWalSnd->flush) ? MyWalSnd->write : MyWalSnd->flush; - if (WalSndCaughtUp && sentPtr == replicatedPtr && + if (WalSndCaughtUp && + (XLogRecPtrIsInvalid(replicatedPtr) || sentPtr == replicatedPtr) && !pq_is_send_pending()) { QueryCompletion qc; -- 2.20.1