database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-02 11:44:50 +03:00
Code

Avoid assertion failure with targeted recovery in standby mode.

Browse Source 
At the end of recovery, standby mode is turned off to re-fetch the last
valid record from archive or pg_wal. Previously, if recovery target was
reached and standby mode was turned off while the current WAL source
was stream, recovery could try to retrieve WAL file containing the last
valid record unexpectedly from stream even though not in standby mode.
This caused an assertion failure. That is, the assertion test confirms that
WAL file should not be retrieved from stream if standby mode is not true.

This commit moves back the current WAL source to archive if it's stream
even though not in standby mode, to avoid that assertion failure.

This issue doesn't cause the server to crash when built with assertion
disabled. In this case, the attempt to retrieve WAL file from stream not
in standby mode just fails. And then recovery tries to retrieve WAL file
from archive or pg_wal.

Back-patch to all supported branches.

Author: Kyotaro Horiguchi
Reviewed-by: Fujii Masao
Discussion: https://postgr.es/m/20200227.124830.2197604521555566121.horikyota.ntt@gmail.com
This commit is contained in:
Fujii Masao 2020-03-09 15:31:31 +09:00
parent 53a039da62
commit 500fe161ed
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/backend/access/transam/xlog.c
View File

@ -7452,7 +7452,11 @@ StartupXLOG(void)
* We are now done reading the xlog from stream. Turn off streaming * We are now done reading the xlog from stream. Turn off streaming
* recovery to force fetching the files (which would be required at end of * recovery to force fetching the files (which would be required at end of
* recovery, e.g., timeline history file) from archive or pg_wal. * recovery, e.g., timeline history file) from archive or pg_wal.
*
* Note that standby mode must be turned off after killing WAL receiver,
* i.e., calling ShutdownWalRcv().
*/ */
Assert(!WalRcvStreaming());
StandbyMode = false; StandbyMode = false;
/* /*
@ -11896,12 +11900,23 @@ WaitForWALToBecomeAvailable(XLogRecPtr RecPtr, bool randAccess,
* values for "check trigger", "rescan timelines", and "sleep" states, * values for "check trigger", "rescan timelines", and "sleep" states,
* those actions are taken when reading from the previous source fails, as * those actions are taken when reading from the previous source fails, as
* part of advancing to the next state. * part of advancing to the next state.
*
* If standby mode is turned off while reading WAL from stream, we move
* to XLOG_FROM_ARCHIVE and reset lastSourceFailed, to force fetching
* the files (which would be required at end of recovery, e.g., timeline
* history file) from archive or pg_wal. We don't need to kill WAL receiver
* here because it's already stopped when standby mode is turned off at
* the end of recovery.
*------- *-------
*/ */
if (!InArchiveRecovery) if (!InArchiveRecovery)
currentSource = XLOG_FROM_PG_WAL; currentSource = XLOG_FROM_PG_WAL;
else if (currentSource == 0) else if (currentSource == 0 ||
(!StandbyMode && currentSource == XLOG_FROM_STREAM))
{
lastSourceFailed = false;
currentSource = XLOG_FROM_ARCHIVE; currentSource = XLOG_FROM_ARCHIVE;
}
for (;;) for (;;)
{ {
@ -12093,6 +12108,12 @@ WaitForWALToBecomeAvailable(XLogRecPtr RecPtr, bool randAccess,
{ {
case XLOG_FROM_ARCHIVE: case XLOG_FROM_ARCHIVE:
case XLOG_FROM_PG_WAL: case XLOG_FROM_PG_WAL:
/*
* WAL receiver must not be running when reading WAL from
* archive or pg_wal.
*/
Assert(!WalRcvStreaming());
/* Close any old file we might have open. */ /* Close any old file we might have open. */
if (readFile >= 0) if (readFile >= 0)
{ {