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

hlinnaka · hlinnaka · commit 51616dcda47a · 2013-03-07T12:22:14.000+02:00
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
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -4464,7 +4464,7 @@ readTimeLineHistory(TimeLineID targetTLI)`
`4464`	`4464`	`if (targetTLI == 1)`
`4465`	4465	`return list_make1_int((int) targetTLI);`
`4466`	`4466`
`4467`		`- if (InArchiveRecovery)`
	`4467`	`+ if (ArchiveRecoveryRequested)`
`4468`	`4468`	`{`
`4469`	`4469`	`TLHistoryFileName(histfname, targetTLI);`
`4470`	`4470`	`fromArchive =`
`@@ -4561,7 +4561,7 @@ existsTimeLineHistory(TimeLineID probeTLI)`
`4561`	`4561`	`if (probeTLI == 1)`
`4562`	`4562`	`return false;`
`4563`	`4563`
`4564`		`- if (InArchiveRecovery)`
	`4564`	`+ if (ArchiveRecoveryRequested)`
`4565`	`4565`	`{`
`4566`	`4566`	`TLHistoryFileName(histfname, probeTLI);`
`4567`	`4567`	`RestoreArchivedFile(path, histfname, "RECOVERYHISTORY", 0);`
`@@ -5758,11 +5758,6 @@ readRecoveryCommandFile(void)`
`5758`	`5758`	`*/`
`5759`	`5759`	`if (rtliGiven)`
`5760`	`5760`	`{`
`5761`		`- /*`
`5762`		`- * Temporarily set InArchiveRecovery, so that existsTimeLineHistory`
`5763`		`- * or findNewestTimeLine below will check the archive.`
`5764`		`- */`
`5765`		`- InArchiveRecovery = true;`
`5766`	`5761`	`if (rtli)`
`5767`	`5762`	`{`
`5768`	`5763`	`/* Timeline 1 does not have a history file, all else should */`
`@@ -5779,7 +5774,6 @@ readRecoveryCommandFile(void)`
`5779`	`5774`	`recoveryTargetTLI = findNewestTimeLine(recoveryTargetTLI);`
`5780`	`5775`	`recoveryTargetIsLatest = true;`
`5781`	`5776`	`}`
`5782`		`- InArchiveRecovery = false;`
`5783`	`5777`	`}`
`5784`	`5778`
`5785`	`5779`	`FreeConfigVariables(head);`