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

hlinnaka · hlinnaka · commit 542bdb214632 · 2010-11-11T19:32:11.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
@@ -5864,6 +5864,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)));
@@ -5888,6 +5889,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;
@@ -5932,10 +5934,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
`@@ -5864,6 +5864,7 @@ StartupXLOG(void)`
`5864`	`5864`	`if (record != NULL)`
`5865`	`5865`	`{`
`5866`	`5866`	`memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));`
	`5867`	`+ wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);`
`5867`	`5868`	`ereport(DEBUG1,`
`5868`	`5869`	`(errmsg("checkpoint record is at %X/%X",`
`5869`	`5870`	`checkPointLoc.xlogid, checkPointLoc.xrecoff)));`
`@@ -5888,6 +5889,7 @@ StartupXLOG(void)`
`5888`	`5889`	`ereport(FATAL,`
`5889`	`5890`	`(errmsg("could not locate required checkpoint record"),`
`5890`	`5891`	`errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir)));`
	`5892`	`+ wasShutdown = false; /* keep compiler quiet */`
`5891`	`5893`	`}`
`5892`	`5894`	`/* set flag to delete it later */`
`5893`	`5895`	`haveBackupLabel = true;`
`@@ -5932,10 +5934,10 @@ StartupXLOG(void)`
`5932`	`5934`	`(errmsg("could not locate a valid checkpoint record")));`
`5933`	`5935`	`}`
`5934`	`5936`	`memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));`
	`5937`	`+ wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);`
`5935`	`5938`	`}`
`5936`	`5939`
`5937`	`5940`	`LastRec = RecPtr = checkPointLoc;`
`5938`		`- wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);`
`5939`	`5941`
`5940`	`5942`	`ereport(DEBUG1,`
`5941`	`5943`	`(errmsg("redo record is at %X/%X; shutdown %s",`