aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2022-09-15 06:45:23 -0700
committerNoah Misch <noah@leadboat.com>2022-09-15 06:45:23 -0700
commitb4f584f9d2a1b50d1f5ce88408a54bb11f1c8353 (patch)
tree99581c4650376e691b12087c28e603a01055adf7 /src
parent7beda87b6a4e5eae66f06df313581f7f53cab813 (diff)
downloadpostgresql-b4f584f9d2a1b50d1f5ce88408a54bb11f1c8353.tar.gz
postgresql-b4f584f9d2a1b50d1f5ce88408a54bb11f1c8353.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/backend/access/transam/xlogrecovery.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/backend/access/transam/xlogrecovery.c b/src/backend/access/transam/xlogrecovery.c
index 30661bdad63..b41e6826643 100644
--- a/src/backend/access/transam/xlogrecovery.c
+++ b/src/backend/access/transam/xlogrecovery.c
@@ -3535,8 +3535,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