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

hlinnaka · hlinnaka · commit 3ef6ea3dcefe · 2010-11-11T19:31:55.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
@@ -4781,6 +4781,7 @@ StartupXLOG(void)
 		if (record != NULL)
 		{
 			memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));
+			wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);
 			ereport(LOG,
 					(errmsg("checkpoint record is at %X/%X",
 							checkPointLoc.xlogid, checkPointLoc.xrecoff)));
@@ -4805,6 +4806,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;
@@ -4839,10 +4841,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(LOG,
 	 (errmsg("redo record is at %X/%X; undo record is at %X/%X; shutdown %s",

Original file line number	Diff line number	Diff line change
`@@ -4781,6 +4781,7 @@ StartupXLOG(void)`
`4781`	`4781`	`if (record != NULL)`
`4782`	`4782`	`{`
`4783`	`4783`	`memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));`
	`4784`	`+ wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);`
`4784`	`4785`	`ereport(LOG,`
`4785`	`4786`	`(errmsg("checkpoint record is at %X/%X",`
`4786`	`4787`	`checkPointLoc.xlogid, checkPointLoc.xrecoff)));`
`@@ -4805,6 +4806,7 @@ StartupXLOG(void)`
`4805`	`4806`	`ereport(FATAL,`
`4806`	`4807`	`(errmsg("could not locate required checkpoint record"),`
`4807`	`4808`	`errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir)));`
	`4809`	`+ wasShutdown = false; /* keep compiler quiet */`
`4808`	`4810`	`}`
`4809`	`4811`	`/* set flag to delete it later */`
`4810`	`4812`	`haveBackupLabel = true;`
`@@ -4839,10 +4841,10 @@ StartupXLOG(void)`
`4839`	`4841`	`(errmsg("could not locate a valid checkpoint record")));`
`4840`	`4842`	`}`
`4841`	`4843`	`memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));`
	`4844`	`+ wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);`
`4842`	`4845`	`}`
`4843`	`4846`
`4844`	`4847`	`LastRec = RecPtr = checkPointLoc;`
`4845`		`- wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);`
`4846`	`4848`
`4847`	`4849`	`ereport(LOG,`
`4848`	`4850`	`(errmsg("redo record is at %X/%X; undo record is at %X/%X; shutdown %s",`