sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-03 00:02:26 -04:00
Code Issues Projects Releases Wiki Activity

Fix tli history file fetching, broken by the archive after crash recevery patch.

Browse Source 
If we were about to enter archive recovery after crash recovery, we scanned
the archive for the latest tli history file, and set the recovery target
timeline to that. However, when we actually tried to read the history file,
we would not fetch the file from the archive, because we were not in archive
recovery yet.

To fix, make readTimeLineHistory and existsTimeLineHistory to always fetch
the file from archive if archive recovery is requested, even if we're not in
archive recovery yet.

Backpatch to 9.2. Mitsumasa KONDO
This commit is contained in:
Heikki Linnakangas 2013-03-07 12:18:41 +02:00
parent d009f9036d
commit 51616dcda4
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4464,7 +4464,7 @@ readTimeLineHistory(TimeLineID targetTLI)
if (targetTLI == 1)
return list_make1_int((int) targetTLI);
if (InArchiveRecovery)
if (ArchiveRecoveryRequested)
{
TLHistoryFileName(histfname, targetTLI);
fromArchive =
@ -4561,7 +4561,7 @@ existsTimeLineHistory(TimeLineID probeTLI)
if (probeTLI == 1)
return false;
if (InArchiveRecovery)
if (ArchiveRecoveryRequested)
{
TLHistoryFileName(histfname, probeTLI);
RestoreArchivedFile(path, histfname, "RECOVERYHISTORY", 0);
@ -5758,11 +5758,6 @@ readRecoveryCommandFile(void)
*/
if (rtliGiven)
{
/*
* Temporarily set InArchiveRecovery, so that existsTimeLineHistory
* or findNewestTimeLine below will check the archive.
*/
InArchiveRecovery = true;
if (rtli)
{
/* Timeline 1 does not have a history file, all else should */
@ -5779,7 +5774,6 @@ readRecoveryCommandFile(void)
recoveryTargetTLI = findNewestTimeLine(recoveryTargetTLI);
recoveryTargetIsLatest = true;
}
InArchiveRecovery = false;
}
FreeConfigVariables(head);