Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5945501

Browse files
committed
Remember asking for feedback during walsender shutdown.
Since 5a991ef we're explicitly asking for feedback from the receiving side when shutting down walsender, if there's not yet replicated data. Unfortunately we didn't remember (i.e. set waiting_for_ping_response to true) having asked for feedback, leading to scenarios in which replies were requested at a high frequency. I can't reproduce this problem on my laptop, I think that's because the problem requires a significant TCP window to manifest due to the !pq_is_send_pending() condition. But since this clearly is a bug, let's fix it. There's quite possibly more wrong than just this though. While fiddling with WalSndDone(), I rewrote a hard to understand comment about looking at the flush vs. the write position. Reported-By: Nick Cleaton, Magnus Hagander Author: Nick Cleaton Discussion: CAFgz3kus=rC_avEgBV=+hRK5HYJ8vXskJRh8yEAbahJGTzF2VQ@mail.gmail.com CABUevExsjROqDcD0A2rnJ6HK6FuKGyewJr3PL12pw85BHFGS2Q@mail.gmail.com Backpatch: 9.4, were 5a991ef introduced the use of feedback messages during shutdown.
1 parent 23b09e1 commit 5945501

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/backend/replication/walsender.c

+8-4
Original file line numberDiff line numberDiff line change
@@ -2487,13 +2487,14 @@ WalSndDone(WalSndSendDataCallback send_data)
24872487
send_data();
24882488

24892489
/*
2490-
* Check a write location to see whether all the WAL have successfully
2491-
* been replicated if this walsender is connecting to a standby such as
2492-
* pg_receivexlog which always returns an invalid flush location.
2493-
* Otherwise, check a flush location.
2490+
* To figure out whether all WAL has successfully been replicated, check
2491+
* flush location if valid, write otherwise. Tools like pg_receivexlog
2492+
* will usually (unless in synchronous mode) return an invalid flush
2493+
* location.
24942494
*/
24952495
replicatedPtr = XLogRecPtrIsInvalid(MyWalSnd->flush) ?
24962496
MyWalSnd->write : MyWalSnd->flush;
2497+
24972498
if (WalSndCaughtUp && sentPtr == replicatedPtr &&
24982499
!pq_is_send_pending())
24992500
{
@@ -2504,7 +2505,10 @@ WalSndDone(WalSndSendDataCallback send_data)
25042505
proc_exit(0);
25052506
}
25062507
if (!waiting_for_ping_response)
2508+
{
25072509
WalSndKeepalive(true);
2510+
waiting_for_ping_response = true;
2511+
}
25082512
}
25092513

25102514
/*

0 commit comments

Comments
 (0)