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

Commit 7900e94

Browse files
committed
Fix pg_receivexlog --slot so that it doesn't prevent the server shutdown.
When pg_receivexlog --slot is connecting to the server, at the shutdown of the server, walsender keeps waiting for the last WAL record to be replicated and flushed in pg_receivexlog. But previously pg_receivexlog issued sync command only when WAL file was switched. So there was the case where the last WAL was never flushed and walsender had to keep waiting infinitely. This caused the server shutdown to get stuck. pg_recvlogical handles this problem by calling fsync() when it receives the request of immediate reply from the server. That is, at shutdown, walsender sends the request, pg_recvlogical receives it, flushes the last WAL record, and sends the flush location back to the server. Since walsender can see that the last WAL record is successfully flushed, it can exit cleanly. This commit introduces the same logic as pg_recvlogical has, to pg_receivexlog. Back-patch to 9.4 where pg_receivexlog was changed so that it can use the replication slot. Original patch by Michael Paquier, rewritten by me. Bug report by Furuya Osamu.
1 parent e1ab2fa commit 7900e94

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

src/bin/pg_basebackup/receivelog.c

+19
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,25 @@ HandleCopyStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline,
918918
/* If the server requested an immediate reply, send one. */
919919
if (replyRequested && still_sending)
920920
{
921+
if (reportFlushPosition && lastFlushPosition < blockpos &&
922+
walfile != 1)
923+
{
924+
/*
925+
* If a valid flush location needs to be reported,
926+
* flush the current WAL file so that the latest flush
927+
* location is sent back to the server. This is necessary to
928+
* see whether the last WAL data has been successfully
929+
* replicated or not, at the normal shutdown of the server.
930+
*/
931+
if (fsync(walfile) != 0)
932+
{
933+
fprintf(stderr, _("%s: could not fsync file \"%s\": %s\n"),
934+
progname, current_walfile_name, strerror(errno));
935+
goto error;
936+
}
937+
lastFlushPosition = blockpos;
938+
}
939+
921940
now = feGetCurrentTimestamp();
922941
if (!sendFeedback(conn, blockpos, now, false))
923942
goto error;

0 commit comments

Comments
 (0)