From 65f4976189b6cbe9aa93fc5f4b1eb7a2040b6301 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Tue, 4 Nov 2025 13:14:46 +0900 Subject: [PATCH] Add assertion check for WAL receiver state during stream-archive transition When the startup process switches from streaming to archive as WAL source, we avoid calling ShutdownWalRcv() if the WAL receiver is not streaming, based on WalRcvStreaming(). WALRCV_STOPPING is a state set by ShutdownWalRcv(), called only by the startup process, meaning that it should not be possible to reach this state while in WaitForWALToBecomeAvailable(). This commit adds an assertion to make sure that a WAL receiver is never in a WALRCV_STOPPING state should the startup process attempt to reset InstallXLogFileSegmentActive. Idea suggested by Noah Misch. Author: Xuneng Zhou Discussion: https://postgr.es/m/19093-c4fff49a608f82a0@postgresql.org --- src/backend/access/transam/xlogrecovery.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c index cb62d43077d..0a5ae5050c4 100644 --- a/src/backend/access/transam/xlogrecovery.c +++ b/src/backend/access/transam/xlogrecovery.c @@ -3698,6 +3698,14 @@ WaitForWALToBecomeAvailable(XLogRecPtr RecPtr, bool randAccess, XLogShutdownWalRcv(); else { + /* + * WALRCV_STOPPING state is a transient state while + * the startup process is in ShutdownWalRcv(). It + * should never appear here since we would be waiting + * for the walreceiver to reach WALRCV_STOPPED in that + * case. + */ + Assert(WalRcvGetState() != WALRCV_STOPPING); ResetInstallXLogFileSegmentActive(); } -- 2.47.3