diff options
| author | Michael Paquier <michael@paquier.xyz> | 2019-10-18 14:27:00 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2019-10-18 14:27:00 +0900 |
| commit | feed5ee4753afa1b53e441271cc3e28345bcae0b (patch) | |
| tree | 81d1743137fa0f44db4e1ce7fa948de002beac7e | |
| parent | 45e4067c05b116bf2b22245361e748939778cc0b (diff) | |
Fix timeout handling in logical replication worker
The timestamp tracking the last moment a message is received in a
logical replication worker was initialized in each loop checking if a
message was received or not, causing wal_receiver_timeout to be ignored
in basically any logical replication deployments. This also broke the
ping sent to the server when reaching half of wal_receiver_timeout.
This simply moves the initialization of the timestamp out of the apply
loop to the beginning of LogicalRepApplyLoop().
Reported-by: Jehan-Guillaume De Rorthais
Author: Julien Rouhaud
Discussion: https://postgr.es/m/CAOBaU_ZHESFcWva8jLjtZdCLspMj7vqaB2k++rjHLY897ZxbYw@mail.gmail.com
Backpatch-through: 10
| -rw-r--r-- | src/backend/replication/logical/worker.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c index ea75cdd3fc3..397d6375523 100644 --- a/src/backend/replication/logical/worker.c +++ b/src/backend/replication/logical/worker.c @@ -1103,6 +1103,8 @@ UpdateWorkerStats(XLogRecPtr last_lsn, TimestampTz send_time, bool reply) static void LogicalRepApplyLoop(XLogRecPtr last_received) { + TimestampTz last_recv_timestamp = GetCurrentTimestamp(); + /* * Init the ApplyMessageContext which we clean up after each replication * protocol message. @@ -1121,7 +1123,6 @@ LogicalRepApplyLoop(XLogRecPtr last_received) int len; char *buf = NULL; bool endofstream = false; - TimestampTz last_recv_timestamp = GetCurrentTimestamp(); bool ping_sent = false; long wait_time; |