On Fri, Jan 28, 2022 at 8:26 PM Kyotaro Horiguchi <horikyota....@gmail.com> wrote: > At Thu, 27 Jan 2022 23:50:04 +1300, Thomas Munro <thomas.mu...@gmail.com> > wrote in > > While working on WaitEventSet-ifying various codepaths, I found it > > strange that walreceiver wakes up 10 times per second while idle. > > Here's a draft patch to compute the correct sleep time. > > Agree to the objective. However I feel the patch makes the code > somewhat less readable maybe because WalRcvComputeNextWakeup hides the > timeout deatils. Of course other might thing differently.
Thanks for looking! The reason why I put the timeout computation into a function is because there are about 3 places you need to do it: at the beginning, when rescheduling for next time, and when the configuration file changes and you might want to recompute them. The logic to decode the GUCs and compute the times would be duplicated. I have added a comment about that, and tried to make the code clearer. Do you have another idea? > - ping_sent = false; > - XLogWalRcvProcessMsg(buf[0], &buf[1], len - 1, > - startpointTLI); > + WalRcvComputeNextWakeup(&state, > + WALRCV_WAKEUP_TIMEOUT, > + last_recv_timestamp); > + WalRcvComputeNextWakeup(&state, > + WALRCV_WAKEUP_PING, > + last_recv_timestamp); > > The calculated target times are not used within the closest loop and > the loop is quite busy. WALRCV_WAKEUP_PING is the replacement of > ping_sent, but I think the computation of both two target times would > be better done after the loop only when the "if (len > 0)" block was > passed. Those two wakeup times should only be adjusted when data is received. The calls should be exactly where last_recv_timestamp is set in master, no? > - XLogWalRcvSendReply(false, false); > + XLogWalRcvSendReply(&state, GetCurrentTimestamp(), > + false, false); > > The GetCurrentTimestamp() is same with last_recv_timestamp when the > recent recv() had any bytes received. So we can avoid the call to > GetCurrentTimestamp in that case. If we do the change above, the same > flag notifies the necessity of separete GetCurrentTimestamp(). Yeah, I agree that we should remove more GetCurrentTimestamp() calls. Here's another idea: let's remove last_recv_timestamp, and just use 'now', being careful to update it after sleeping and in the receive loop (in case it gets busy for a long time), so that it's always fresh enough. > I understand the reason for startpointTLI being stored in WalRcvInfo > but don't understand about primary_has_standby_xmin. It is just moved > from a static variable of XLogWalRcvSendHSFeedback to the struct > member that is modifed and read only by the same function. Yeah, this was unnecessary refactoring. I removed that change (we could look into moving more state into the new state object instead of using static locals and globals, but that can be for another thread, I got carried away...) > The enum item WALRCV_WAKEUP_TIMEOUT looks somewhat uninformative. How > about naming it WALRCV_WAKEUP_TERMIATE (or WALRCV_WAKEUP_TO_DIE)? Ok, let's try TERMINATE. > WALRCV_WAKEUP_TIMEOUT and WALRCV_WAKEUP_PING doesn't fire when > wal_receiver_timeout is zero. In that case we should not set the > timeouts at all to avoid spurious wakeups? Oh, yeah, I forgot to handle wal_receiver_timeout = 0. Fixed.
From f7872d44d955e8b40f040487968ad366c16fb54f Mon Sep 17 00:00:00 2001 From: Thomas Munro <thomas.mu...@gmail.com> Date: Thu, 27 Jan 2022 21:43:17 +1300 Subject: [PATCH v2] Suppress useless wakeups in walreceiver. Instead of waking up 10 times per second to check for various timeout conditions, keep track of when we next have periodic work to do. Reviewed-by: Kyotaro Horiguchi <horikyota....@gmail.com> Discussion: https://postgr.es/m/CA%2BhUKGJGhX4r2LPUE3Oy9BX71Eum6PBcS8L3sJpScR9oKaTVaA%40mail.gmail.com --- src/backend/replication/walreceiver.c | 277 ++++++++++++++++---------- 1 file changed, 169 insertions(+), 108 deletions(-) diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c index b39fce8c23..d90f5aefef 100644 --- a/src/backend/replication/walreceiver.c +++ b/src/backend/replication/walreceiver.c @@ -94,8 +94,6 @@ bool hot_standby_feedback; static WalReceiverConn *wrconn = NULL; WalReceiverFunctionsType *WalReceiverFunctions = NULL; -#define NAPTIME_PER_CYCLE 100 /* max sleep time between cycles (100ms) */ - /* * These variables are used similarly to openLogFile/SegNo, * but for walreceiver to write the XLOG. recvFileTLI is the TimeLineID @@ -115,6 +113,27 @@ static struct XLogRecPtr Flush; /* last byte + 1 flushed in the standby */ } LogstreamResult; +/* + * Reasons to wake up and perform periodic tasks. + */ +typedef enum WalRcvWakeupReason +{ + WALRCV_WAKEUP_TERMINATE, + WALRCV_WAKEUP_PING, + WALRCV_WAKEUP_REPLY, + WALRCV_WAKEUP_HSFEEDBACK, + NUM_WALRCV_WAKEUPS +} WalRcvWakeupReason; + +/* + * A struct to keep track of non-shared state. + */ +typedef struct WalRcvInfo +{ + TimeLineID startpointTLI; + TimestampTz wakeup[NUM_WALRCV_WAKEUPS]; +} WalRcvInfo; + static StringInfoData reply_message; static StringInfoData incoming_message; @@ -122,15 +141,24 @@ static StringInfoData incoming_message; static void WalRcvFetchTimeLineHistoryFiles(TimeLineID first, TimeLineID last); static void WalRcvWaitForStartPosition(XLogRecPtr *startpoint, TimeLineID *startpointTLI); static void WalRcvDie(int code, Datum arg); -static void XLogWalRcvProcessMsg(unsigned char type, char *buf, Size len, +static void XLogWalRcvProcessMsg(WalRcvInfo *state, + unsigned char type, char *buf, Size len, TimeLineID tli); -static void XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr, - TimeLineID tli); -static void XLogWalRcvFlush(bool dying, TimeLineID tli); -static void XLogWalRcvClose(XLogRecPtr recptr, TimeLineID tli); -static void XLogWalRcvSendReply(bool force, bool requestReply); -static void XLogWalRcvSendHSFeedback(bool immed); +static void XLogWalRcvWrite(WalRcvInfo *state, char *buf, Size nbytes, + XLogRecPtr recptr, TimeLineID tli); +static void XLogWalRcvFlush(WalRcvInfo *state, bool dying, TimeLineID tli); +static void XLogWalRcvClose(WalRcvInfo *state, XLogRecPtr recptr, TimeLineID tli); +static void XLogWalRcvSendReply(WalRcvInfo *state, + TimestampTz now, + bool force, + bool requestReply); +static void XLogWalRcvSendHSFeedback(WalRcvInfo *state, + TimestampTz now, + bool immed); static void ProcessWalSndrMessage(XLogRecPtr walEnd, TimestampTz sendTime); +static void WalRcvComputeNextWakeup(WalRcvInfo *state, + WalRcvWakeupReason reason, + TimestampTz now); /* * Process any interrupts the walreceiver process may have received. @@ -164,7 +192,6 @@ ProcessWalRcvInterrupts(void) } } - /* Main entry point for walreceiver process */ void WalReceiverMain(void) @@ -174,16 +201,14 @@ WalReceiverMain(void) char slotname[NAMEDATALEN]; bool is_temp_slot; XLogRecPtr startpoint; - TimeLineID startpointTLI; TimeLineID primaryTLI; bool first_stream; WalRcvData *walrcv = WalRcv; - TimestampTz last_recv_timestamp; TimestampTz now; - bool ping_sent; char *err; char *sender_host = NULL; int sender_port = 0; + WalRcvInfo state = {0}; /* * WalRcv should be set up already (if we are a backend, we inherit this @@ -237,7 +262,7 @@ WalReceiverMain(void) strlcpy(slotname, (char *) walrcv->slotname, NAMEDATALEN); is_temp_slot = walrcv->is_temp_slot; startpoint = walrcv->receiveStart; - startpointTLI = walrcv->receiveStartTLI; + state.startpointTLI = walrcv->receiveStartTLI; /* * At most one of is_temp_slot and slotname can be set; otherwise, @@ -257,7 +282,7 @@ WalReceiverMain(void) pg_atomic_write_u64(&WalRcv->writtenUpto, 0); /* Arrange to clean up at walreceiver exit */ - on_shmem_exit(WalRcvDie, PointerGetDatum(&startpointTLI)); + on_shmem_exit(WalRcvDie, PointerGetDatum(&state)); /* Properly accept or ignore signals the postmaster might send us */ pqsignal(SIGHUP, SignalHandlerForConfigReload); /* set flag to read config @@ -344,11 +369,11 @@ WalReceiverMain(void) * Confirm that the current timeline of the primary is the same or * ahead of ours. */ - if (primaryTLI < startpointTLI) + if (primaryTLI < state.startpointTLI) ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), errmsg("highest timeline %u of the primary is behind recovery timeline %u", - primaryTLI, startpointTLI))); + primaryTLI, state.startpointTLI))); /* * Get any missing history files. We do this always, even when we're @@ -360,7 +385,7 @@ WalReceiverMain(void) * but let's avoid the confusion of timeline id collisions where we * can. */ - WalRcvFetchTimeLineHistoryFiles(startpointTLI, primaryTLI); + WalRcvFetchTimeLineHistoryFiles(state.startpointTLI, primaryTLI); /* * Create temporary replication slot if requested, and update slot @@ -395,17 +420,17 @@ WalReceiverMain(void) options.logical = false; options.startpoint = startpoint; options.slotname = slotname[0] != '\0' ? slotname : NULL; - options.proto.physical.startpointTLI = startpointTLI; + options.proto.physical.startpointTLI = state.startpointTLI; if (walrcv_startstreaming(wrconn, &options)) { if (first_stream) ereport(LOG, (errmsg("started streaming WAL from primary at %X/%X on timeline %u", - LSN_FORMAT_ARGS(startpoint), startpointTLI))); + LSN_FORMAT_ARGS(startpoint), state.startpointTLI))); else ereport(LOG, (errmsg("restarted WAL streaming at %X/%X on timeline %u", - LSN_FORMAT_ARGS(startpoint), startpointTLI))); + LSN_FORMAT_ARGS(startpoint), state.startpointTLI))); first_stream = false; /* Initialize LogstreamResult and buffers for processing messages */ @@ -413,9 +438,10 @@ WalReceiverMain(void) initStringInfo(&reply_message); initStringInfo(&incoming_message); - /* Initialize the last recv timestamp */ - last_recv_timestamp = GetCurrentTimestamp(); - ping_sent = false; + /* Initialize nap wakeup times. */ + now = GetCurrentTimestamp(); + for (int i = 0; i < NUM_WALRCV_WAKEUPS; ++i) + WalRcvComputeNextWakeup(&state, i, now); /* Loop until end-of-streaming or error */ for (;;) @@ -425,6 +451,8 @@ WalReceiverMain(void) bool endofwal = false; pgsocket wait_fd = PGINVALID_SOCKET; int rc; + TimestampTz nextWakeup; + int nap; /* * Exit walreceiver if we're not in recovery. This should not @@ -442,11 +470,17 @@ WalReceiverMain(void) { ConfigReloadPending = false; ProcessConfigFile(PGC_SIGHUP); - XLogWalRcvSendHSFeedback(true); + now = GetCurrentTimestamp(); + for (int i = 0; i < NUM_WALRCV_WAKEUPS; ++i) + WalRcvComputeNextWakeup(&state, i, now); + XLogWalRcvSendHSFeedback(&state, + GetCurrentTimestamp(), + true); } /* See if we can read data immediately */ len = walrcv_receive(wrconn, &buf, &wait_fd); + now = GetCurrentTimestamp(); if (len != 0) { /* @@ -458,13 +492,18 @@ WalReceiverMain(void) if (len > 0) { /* - * Something was received from primary, so reset - * timeout + * Something was received from primary, so adjust + * the ping and terminate wakeup times. */ - last_recv_timestamp = GetCurrentTimestamp(); - ping_sent = false; - XLogWalRcvProcessMsg(buf[0], &buf[1], len - 1, - startpointTLI); + WalRcvComputeNextWakeup(&state, + WALRCV_WAKEUP_TERMINATE, + now); + WalRcvComputeNextWakeup(&state, + WALRCV_WAKEUP_PING, + now); + XLogWalRcvProcessMsg(&state, + buf[0], &buf[1], len - 1, + state.startpointTLI); } else if (len == 0) break; @@ -473,29 +512,36 @@ WalReceiverMain(void) ereport(LOG, (errmsg("replication terminated by primary server"), errdetail("End of WAL reached on timeline %u at %X/%X.", - startpointTLI, + state.startpointTLI, LSN_FORMAT_ARGS(LogstreamResult.Write)))); endofwal = true; break; } len = walrcv_receive(wrconn, &buf, &wait_fd); + now = GetCurrentTimestamp(); } /* Let the primary know that we received some data. */ - XLogWalRcvSendReply(false, false); + XLogWalRcvSendReply(&state, now, false, false); /* * If we've written some records, flush them to disk and * let the startup process and primary server know about * them. */ - XLogWalRcvFlush(false, startpointTLI); + XLogWalRcvFlush(&state, false, state.startpointTLI); } /* Check if we need to exit the streaming loop. */ if (endofwal) break; + /* Find the soonest wakeup time, to limit our nap. */ + nextWakeup = INT64_MAX; + for (int i = 0; i < NUM_WALRCV_WAKEUPS; ++i) + nextWakeup = Min(state.wakeup[i], nextWakeup); + nap = Max(0, (nextWakeup - now) / 1000); + /* * Ideally we would reuse a WaitEventSet object repeatedly * here to avoid the overheads of WaitLatchOrSocket on epoll @@ -512,8 +558,9 @@ WalReceiverMain(void) WL_EXIT_ON_PM_DEATH | WL_SOCKET_READABLE | WL_TIMEOUT | WL_LATCH_SET, wait_fd, - NAPTIME_PER_CYCLE, + nap, WAIT_EVENT_WAL_RECEIVER_MAIN); + now = GetCurrentTimestamp(); if (rc & WL_LATCH_SET) { ResetLatch(MyLatch); @@ -529,7 +576,7 @@ WalReceiverMain(void) */ walrcv->force_reply = false; pg_memory_barrier(); - XLogWalRcvSendReply(true, false); + XLogWalRcvSendReply(&state, now, true, false); } } if (rc & WL_TIMEOUT) @@ -549,38 +596,23 @@ WalReceiverMain(void) * Check if time since last receive from primary has * reached the configured limit. */ - if (wal_receiver_timeout > 0) - { - TimestampTz now = GetCurrentTimestamp(); - TimestampTz timeout; - - timeout = - TimestampTzPlusMilliseconds(last_recv_timestamp, - wal_receiver_timeout); + if (now >= state.wakeup[WALRCV_WAKEUP_TERMINATE]) + ereport(ERROR, + (errcode(ERRCODE_CONNECTION_FAILURE), + errmsg("terminating walreceiver due to timeout"))); - if (now >= timeout) - ereport(ERROR, - (errcode(ERRCODE_CONNECTION_FAILURE), - errmsg("terminating walreceiver due to timeout"))); - - /* - * We didn't receive anything new, for half of - * receiver replication timeout. Ping the server. - */ - if (!ping_sent) - { - timeout = TimestampTzPlusMilliseconds(last_recv_timestamp, - (wal_receiver_timeout / 2)); - if (now >= timeout) - { - requestReply = true; - ping_sent = true; - } - } + /* + * We didn't receive anything new, for half of receiver + * replication timeout. Ping the server. + */ + if (now >= state.wakeup[WALRCV_WAKEUP_PING]) + { + requestReply = true; + state.wakeup[WALRCV_WAKEUP_PING] = INT64_MAX; } - XLogWalRcvSendReply(requestReply, requestReply); - XLogWalRcvSendHSFeedback(false); + XLogWalRcvSendReply(&state, now, requestReply, requestReply); + XLogWalRcvSendHSFeedback(&state, now, false); } } @@ -595,12 +627,12 @@ WalReceiverMain(void) * know about when we began streaming, fetch its timeline history * file now. */ - WalRcvFetchTimeLineHistoryFiles(startpointTLI, primaryTLI); + WalRcvFetchTimeLineHistoryFiles(state.startpointTLI, primaryTLI); } else ereport(LOG, (errmsg("primary server contains no more WAL on requested timeline %u", - startpointTLI))); + state.startpointTLI))); /* * End of WAL reached on the requested timeline. Close the last @@ -610,7 +642,7 @@ WalReceiverMain(void) { char xlogfname[MAXFNAMELEN]; - XLogWalRcvFlush(false, startpointTLI); + XLogWalRcvFlush(&state, false, state.startpointTLI); XLogFileName(xlogfname, recvFileTLI, recvSegNo, wal_segment_size); if (close(recvFile) != 0) ereport(PANIC, @@ -630,7 +662,7 @@ WalReceiverMain(void) recvFile = -1; elog(DEBUG1, "walreceiver ended streaming and awaits new instructions"); - WalRcvWaitForStartPosition(&startpoint, &startpointTLI); + WalRcvWaitForStartPosition(&startpoint, &state.startpointTLI); } /* not reached */ } @@ -778,12 +810,10 @@ static void WalRcvDie(int code, Datum arg) { WalRcvData *walrcv = WalRcv; - TimeLineID *startpointTLI_p = (TimeLineID *) DatumGetPointer(arg); - - Assert(*startpointTLI_p != 0); + WalRcvInfo *state = (WalRcvInfo *) DatumGetPointer(arg); /* Ensure that all WAL records received are flushed to disk */ - XLogWalRcvFlush(true, *startpointTLI_p); + XLogWalRcvFlush(state, true, state->startpointTLI); /* Mark ourselves inactive in shared memory */ SpinLockAcquire(&walrcv->mutex); @@ -813,7 +843,8 @@ WalRcvDie(int code, Datum arg) * Accept the message from XLOG stream, and process it. */ static void -XLogWalRcvProcessMsg(unsigned char type, char *buf, Size len, TimeLineID tli) +XLogWalRcvProcessMsg(WalRcvInfo *state, + unsigned char type, char *buf, Size len, TimeLineID tli) { int hdrlen; XLogRecPtr dataStart; @@ -843,7 +874,7 @@ XLogWalRcvProcessMsg(unsigned char type, char *buf, Size len, TimeLineID tli) buf += hdrlen; len -= hdrlen; - XLogWalRcvWrite(buf, len, dataStart, tli); + XLogWalRcvWrite(state, buf, len, dataStart, tli); break; } case 'k': /* Keepalive */ @@ -865,7 +896,7 @@ XLogWalRcvProcessMsg(unsigned char type, char *buf, Size len, TimeLineID tli) /* If the primary requested a reply, send one immediately */ if (replyRequested) - XLogWalRcvSendReply(true, false); + XLogWalRcvSendReply(state, GetCurrentTimestamp(), true, false); break; } default: @@ -880,7 +911,8 @@ XLogWalRcvProcessMsg(unsigned char type, char *buf, Size len, TimeLineID tli) * Write XLOG data to disk. */ static void -XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr, TimeLineID tli) +XLogWalRcvWrite(WalRcvInfo *state, char *buf, Size nbytes, XLogRecPtr recptr, + TimeLineID tli) { int startoff; int byteswritten; @@ -893,7 +925,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr, TimeLineID tli) /* Close the current segment if it's completed */ if (recvFile >= 0 && !XLByteInSeg(recptr, recvSegNo, wal_segment_size)) - XLogWalRcvClose(recptr, tli); + XLogWalRcvClose(state, recptr, tli); if (recvFile < 0) { @@ -953,7 +985,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr, TimeLineID tli) * segment is received and written. */ if (recvFile >= 0 && !XLByteInSeg(recptr, recvSegNo, wal_segment_size)) - XLogWalRcvClose(recptr, tli); + XLogWalRcvClose(state, recptr, tli); } /* @@ -963,7 +995,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr, TimeLineID tli) * an error, so we skip sending a reply in that case. */ static void -XLogWalRcvFlush(bool dying, TimeLineID tli) +XLogWalRcvFlush(WalRcvInfo *state, bool dying, TimeLineID tli) { Assert(tli != 0); @@ -1003,8 +1035,8 @@ XLogWalRcvFlush(bool dying, TimeLineID tli) /* Also let the primary know that we made some progress */ if (!dying) { - XLogWalRcvSendReply(false, false); - XLogWalRcvSendHSFeedback(false); + XLogWalRcvSendReply(state, GetCurrentTimestamp(), false, false); + XLogWalRcvSendHSFeedback(state, GetCurrentTimestamp(), false); } } } @@ -1018,7 +1050,7 @@ XLogWalRcvFlush(bool dying, TimeLineID tli) * Create an archive notification file since the segment is known completed. */ static void -XLogWalRcvClose(XLogRecPtr recptr, TimeLineID tli) +XLogWalRcvClose(WalRcvInfo *state, XLogRecPtr recptr, TimeLineID tli) { char xlogfname[MAXFNAMELEN]; @@ -1029,7 +1061,7 @@ XLogWalRcvClose(XLogRecPtr recptr, TimeLineID tli) * fsync() and close current file before we switch to next one. We would * otherwise have to reopen this file to fsync it later */ - XLogWalRcvFlush(false, tli); + XLogWalRcvFlush(state, false, tli); XLogFileName(xlogfname, recvFileTLI, recvSegNo, wal_segment_size); @@ -1070,13 +1102,12 @@ XLogWalRcvClose(XLogRecPtr recptr, TimeLineID tli) * wal_receiver_timeout. */ static void -XLogWalRcvSendReply(bool force, bool requestReply) +XLogWalRcvSendReply(WalRcvInfo *state, TimestampTz now, bool force, + bool requestReply) { static XLogRecPtr writePtr = 0; static XLogRecPtr flushPtr = 0; XLogRecPtr applyPtr; - static TimestampTz sendTime = 0; - TimestampTz now; /* * If the user doesn't want status to be reported to the primary, be sure @@ -1085,9 +1116,6 @@ XLogWalRcvSendReply(bool force, bool requestReply) if (!force && wal_receiver_status_interval <= 0) return; - /* Get current timestamp. */ - now = GetCurrentTimestamp(); - /* * We can compare the write and flush positions to the last message we * sent without taking any lock, but the apply position requires a spin @@ -1100,10 +1128,11 @@ XLogWalRcvSendReply(bool force, bool requestReply) if (!force && writePtr == LogstreamResult.Write && flushPtr == LogstreamResult.Flush - && !TimestampDifferenceExceeds(sendTime, now, - wal_receiver_status_interval * 1000)) + && now < state->wakeup[WALRCV_WAKEUP_REPLY]) return; - sendTime = now; + + /* Make sure we wake up when it's time to send another reply. */ + WalRcvComputeNextWakeup(state, WALRCV_WAKEUP_REPLY, now); /* Construct a new message */ writePtr = LogstreamResult.Write; @@ -1139,16 +1168,14 @@ XLogWalRcvSendReply(bool force, bool requestReply) * send a feedback message explicitly setting InvalidTransactionId). */ static void -XLogWalRcvSendHSFeedback(bool immed) +XLogWalRcvSendHSFeedback(WalRcvInfo *state, TimestampTz now, bool immed) { - TimestampTz now; FullTransactionId nextFullXid; TransactionId nextXid; uint32 xmin_epoch, catalog_xmin_epoch; TransactionId xmin, catalog_xmin; - static TimestampTz sendTime = 0; /* initially true so we always send at least one feedback message */ static bool primary_has_standby_xmin = true; @@ -1161,19 +1188,12 @@ XLogWalRcvSendHSFeedback(bool immed) !primary_has_standby_xmin) return; - /* Get current timestamp. */ - now = GetCurrentTimestamp(); + /* Send feedback at most once per wal_receiver_status_interval. */ + if (!immed && now < state->wakeup[WALRCV_WAKEUP_HSFEEDBACK]) + return; - if (!immed) - { - /* - * Send feedback at most once per wal_receiver_status_interval. - */ - if (!TimestampDifferenceExceeds(sendTime, now, - wal_receiver_status_interval * 1000)) - return; - sendTime = now; - } + /* Make sure we wake up when it's time to send feedback again. */ + WalRcvComputeNextWakeup(state, WALRCV_WAKEUP_HSFEEDBACK, now); /* * If Hot Standby is not yet accepting connections there is nothing to @@ -1284,6 +1304,47 @@ ProcessWalSndrMessage(XLogRecPtr walEnd, TimestampTz sendTime) } } +/* + * Compute the next wakeup time for a given wakeup reason. Can be called to + * initialize a wakeup time, to adjust it for the next wakeup, or to + * reinitialize it when GUCs have changed. + */ +static void +WalRcvComputeNextWakeup(WalRcvInfo *state, + WalRcvWakeupReason reason, + TimestampTz now) +{ + switch (reason) + { + case WALRCV_WAKEUP_TERMINATE: + if (wal_receiver_timeout <= 0) + state->wakeup[reason] = INT64_MAX; + else + state->wakeup[reason] = now + wal_receiver_timeout * 1000; + break; + case WALRCV_WAKEUP_PING: + if (wal_receiver_timeout <= 0) + state->wakeup[reason] = INT64_MAX; + else + state->wakeup[reason] = now + (wal_receiver_timeout / 2) * 1000; + break; + case WALRCV_WAKEUP_HSFEEDBACK: + if (!hot_standby_feedback || wal_receiver_status_interval <= 0) + state->wakeup[reason] = INT64_MAX; + else + state->wakeup[reason] = now + wal_receiver_status_interval * 1000000; + break; + case WALRCV_WAKEUP_REPLY: + if (wal_receiver_status_interval <= 0) + state->wakeup[reason] = INT64_MAX; + else + state->wakeup[reason] = now + wal_receiver_status_interval * 1000000; + break; + default: + break; + } +} + /* * Wake up the walreceiver main loop. * -- 2.33.1
