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

hlinnaka · hlinnaka · commit f5cf3ce7a47b · 2010-11-11T19:31:47.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
@@ -4424,6 +4424,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)));
@@ -4448,6 +4449,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 */
 		}
 	}
 	else
@@ -4480,10 +4482,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
`@@ -4424,6 +4424,7 @@ StartupXLOG(void)`
`4424`	`4424`	`if (record != NULL)`
`4425`	`4425`	`{`
`4426`	`4426`	`memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));`
	`4427`	`+ wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);`
`4427`	`4428`	`ereport(LOG,`
`4428`	`4429`	`(errmsg("checkpoint record is at %X/%X",`
`4429`	`4430`	`checkPointLoc.xlogid, checkPointLoc.xrecoff)));`
`@@ -4448,6 +4449,7 @@ StartupXLOG(void)`
`4448`	`4449`	`ereport(FATAL,`
`4449`	`4450`	`(errmsg("could not locate required checkpoint record"),`
`4450`	`4451`	`errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir)));`
	`4452`	`+ wasShutdown = false; /* keep compiler quiet */`
`4451`	`4453`	`}`
`4452`	`4454`	`}`
`4453`	`4455`	`else`
`@@ -4480,10 +4482,10 @@ StartupXLOG(void)`
`4480`	`4482`	`(errmsg("could not locate a valid checkpoint record")));`
`4481`	`4483`	`}`
`4482`	`4484`	`memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));`
	`4485`	`+ wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);`
`4483`	`4486`	`}`
`4484`	`4487`
`4485`	`4488`	`LastRec = RecPtr = checkPointLoc;`
`4486`		`- wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);`
`4487`	`4489`
`4488`	`4490`	`ereport(LOG,`
`4489`	`4491`	`(errmsg("redo record is at %X/%X; undo record is at %X/%X; shutdown %s",`