1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Heikki Linnakangas 2010-11-11 19:21:49 +02:00
parent 5154ebad98
commit f5cf3ce7a4
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/access/transam/xlog.c
View File

@ -4424,6 +4424,7 @@ StartupXLOG(void)
if (record != NULL) if (record != NULL)
{ {
memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint)); memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));
wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);
ereport(LOG, ereport(LOG,
(errmsg("checkpoint record is at %X/%X", (errmsg("checkpoint record is at %X/%X",
checkPointLoc.xlogid, checkPointLoc.xrecoff))); checkPointLoc.xlogid, checkPointLoc.xrecoff)));
@ -4448,6 +4449,7 @@ StartupXLOG(void)
ereport(FATAL, ereport(FATAL,
(errmsg("could not locate required checkpoint record"), (errmsg("could not locate required checkpoint record"),
errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir))); errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".", DataDir)));
wasShutdown = false; /* keep compiler quiet */
} }
} }
else else
@ -4480,10 +4482,10 @@ StartupXLOG(void)
(errmsg("could not locate a valid checkpoint record"))); (errmsg("could not locate a valid checkpoint record")));
} }
memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint)); memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));
wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);
} }
LastRec = RecPtr = checkPointLoc; LastRec = RecPtr = checkPointLoc;
wasShutdown = (record->xl_info == XLOG_CHECKPOINT_SHUTDOWN);
ereport(LOG, ereport(LOG,
(errmsg("redo record is at %X/%X; undo record is at %X/%X; shutdown %s", (errmsg("redo record is at %X/%X; undo record is at %X/%X; shutdown %s",