Fix bug introduced by the recent patch to check that the checkpoint redo

hlinnaka · hlinnaka · commit 9dba66c0e524 · 2010-11-11T19:32:07.000+02:00
location read from backup label file can be found: wasShutdown was set
incorrectly when a backup label file was found.

Jeff Davis, with a little tweaking by me.
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -5830,6 +5830,7 @@ StartupXLOG(void)
 		if (record != NULL)
 		{
 			memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));
+			wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);
 			ereport(DEBUG1,
 					(errmsg("checkpoint record is at %X/%X",
 							checkPointLoc.xlogid, checkPointLoc.xrecoff)));
@@ -5854,6 +5855,7 @@ StartupXLOG(void)
 			ereport(FATAL,
 					(errmsg("could not locate required checkpoint record"),
 					 errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir)));
+			wasShutdown = false; /* keep compiler quiet */
 		}
 		/* set flag to delete it later */
 		haveBackupLabel = true;
@@ -5898,10 +5900,10 @@ StartupXLOG(void)
 					 (errmsg("could not locate a valid checkpoint record")));
 		}
 		memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));
+		wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);
 	}
 
 	LastRec = RecPtr = checkPointLoc;
-	wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);
 
 	ereport(DEBUG1,
 			(errmsg("redo record is at %X/%X; shutdown %s",

Original file line number	Diff line number	Diff line change
`@@ -5830,6 +5830,7 @@ StartupXLOG(void)`
`5830`	`5830`	`if (record != NULL)`
`5831`	`5831`	`{`
`5832`	`5832`	`memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));`
	`5833`	`+ wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);`
`5833`	`5834`	`ereport(DEBUG1,`
`5834`	`5835`	`(errmsg("checkpoint record is at %X/%X",`
`5835`	`5836`	`checkPointLoc.xlogid, checkPointLoc.xrecoff)));`
`@@ -5854,6 +5855,7 @@ StartupXLOG(void)`
`5854`	`5855`	`ereport(FATAL,`
`5855`	`5856`	`(errmsg("could not locate required checkpoint record"),`
`5856`	`5857`	`errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir)));`
	`5858`	`+ wasShutdown = false; /* keep compiler quiet */`
`5857`	`5859`	`}`
`5858`	`5860`	`/* set flag to delete it later */`
`5859`	`5861`	`haveBackupLabel = true;`
`@@ -5898,10 +5900,10 @@ StartupXLOG(void)`
`5898`	`5900`	`(errmsg("could not locate a valid checkpoint record")));`
`5899`	`5901`	`}`
`5900`	`5902`	`memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));`
	`5903`	`+ wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);`
`5901`	`5904`	`}`
`5902`	`5905`
`5903`	`5906`	`LastRec = RecPtr = checkPointLoc;`
`5904`		`- wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);`
`5905`	`5907`
`5906`	`5908`	`ereport(DEBUG1,`
`5907`	`5909`	`(errmsg("redo record is at %X/%X; shutdown %s",`