Skip to content

Commit 3f145f6

Browse files
committed
Support clean switchover.
In replication, when we shutdown the master, walsender tries to send all the outstanding WAL records to the standby, and then to exit. This basically means that all the WAL records are fully synced between two servers after the clean shutdown of the master. So, after promoting the standby to new master, we can restart the stopped master as new standby without the need for a fresh backup from new master. But there was one problem so far: though walsender tries to send all the outstanding WAL records, it doesn't wait for them to be replicated to the standby. Then, before receiving all the WAL records, walreceiver can detect the closure of connection and exit. We cannot guarantee that there is no missing WAL in the standby after clean shutdown of the master. In this case, backup from new master is required when restarting the stopped master as new standby. This patch fixes this problem. It just changes walsender so that it waits for all the outstanding WAL records to be replicated to the standby before closing the replication connection. Per discussion, this is a fix that needs to get backpatched rather than new feature. So, back-patch to 9.1 where enough infrastructure for this exists. Patch by me, reviewed by Andres Freund.
1 parent a41c881 commit 3f145f6

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/backend/replication/walsender.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
* If the server is shut down, postmaster sends us SIGUSR2 after all
2323
* regular backends have exited and the shutdown checkpoint has been written.
2424
* This instruct walsender to send any outstanding WAL, including the
25-
* shutdown checkpoint record, and then exit.
25+
* shutdown checkpoint record, wait for it to be replicated to the standby,
26+
* and then exit.
2627
*
2728
*
2829
* Portions Copyright (c) 2010-2011, PostgreSQL Global Development Group
@@ -767,15 +768,17 @@ WalSndLoop(void)
767768

768769
/*
769770
* When SIGUSR2 arrives, we send any outstanding logs up to the
770-
* shutdown checkpoint record (i.e., the latest record) and exit.
771+
* shutdown checkpoint record (i.e., the latest record), wait
772+
* for them to be replicated to the standby, and exit.
771773
* This may be a normal termination at shutdown, or a promotion,
772774
* the walsender is not sure which.
773775
*/
774776
if (walsender_ready_to_stop)
775777
{
776778
/* ... let's just be real sure we're caught up ... */
777779
XLogSend(output_message, &caughtup);
778-
if (caughtup && !pq_is_send_pending())
780+
if (caughtup && XLByteEQ(sentPtr, MyWalSnd->flush) &&
781+
!pq_is_send_pending())
779782
{
780783
walsender_shutdown_requested = true;
781784
continue; /* don't want to wait more */

0 commit comments

Comments
 (0)