postgres.git / summary / log / commit / refs

commit    e36cbef04bd59f5e2e56a180475d64b0dc06d069
Author:   Noah Misch <noah@leadboat.com>
Date:     Thu Sep 15 13:45:23 2022 +0000
First released in: 16.0, 15.0

    Reset InstallXLogFileSegmentActive after walreceiver self-initiated exit.
    
    After commit cc2c7d65fc27e877c9f407587b0b92d46cd6dd16 added this flag,
    failure to reset it caused assertion failures.  In non-assert builds, it
    made the system fail to achieve the objectives listed in that commit;
    chiefly, we might emit a spurious log message.  Back-patch to v15, where
    that commit first appeared.
    
    Bharath Rupireddy and Kyotaro Horiguchi.  Reviewed by Dilip Kumar,
    Nathan Bossart and Michael Paquier.  Reported by Dilip Kumar.
    
    Discussion: https://postgr.es/m/CAFiTN-sE3ry=ycMPVtC+Djw4Fd7gbUGVv_qqw6qfzp=JLvqT3g@mail.gmail.com


 src/backend/access/transam/xlogrecovery.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c
index ec79f492ee8..65bc11d5d36 100644
--- a/src/backend/access/transam/xlogrecovery.c
+++ b/src/backend/access/transam/xlogrecovery.c
@@ -3530,8 +3530,7 @@ WaitForWALToBecomeAvailable(XLogRecPtr RecPtr, bool randAccess,
 					 * walreceiver is not active, so that it won't overwrite
 					 * WAL that we restore from archive.
 					 */
-					if (WalRcvStreaming())
-						XLogShutdownWalRcv();
+					XLogShutdownWalRcv();
 
 					/*
 					 * Before we sleep, re-scan for possible new timelines if


[parent: eed548822ca2]