From 0df5eb2229d0e417e8aa52d83ea6b30681bdeef9 Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Mon, 2 Feb 2015 12:49:45 +0900 Subject: [PATCH] Make sure to send feedback at desired timing. Continuous stream due to heavy-load on client side can prevent feedbacks to be sent with expected interval, and it results in a replication timeout on walsender. Exiting from the fast-path loop when the time comes to make sure the feedback to be sent with expected intervals. --- src/bin/pg_basebackup/receivelog.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c index 8caedff..fb6738d 100644 --- a/src/bin/pg_basebackup/receivelog.c +++ b/src/bin/pg_basebackup/receivelog.c @@ -925,9 +925,15 @@ HandleCopyStream(PGconn *conn, XLogRecPtr startpos, uint32 timeline, } /* - * Process the received data, and any subsequent data we - * can read without blocking. + * Process the received data, and any subsequent data we can read + * without blocking except when the time to feedback comes. */ + now = feGetCurrentTimestamp(); + if (standby_message_timeout > 0 && + feTimestampDifferenceExceeds(last_status, now, + standby_message_timeout)) + break; + r = CopyStreamReceive(conn, 0, ©buf); } } -- 2.1.0.GIT