database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-29 13:56:47 +03:00
Code

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 90e8efa338
commit ad37f7af4a
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

@ -4931,6 +4931,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(DEBUG1, ereport(DEBUG1,
(errmsg("checkpoint record is at %X/%X", (errmsg("checkpoint record is at %X/%X",
checkPointLoc.xlogid, checkPointLoc.xrecoff))); checkPointLoc.xlogid, checkPointLoc.xrecoff)));
@ -4955,6 +4956,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 */
} }
/* set flag to delete it later */ /* set flag to delete it later */
haveBackupLabel = true; haveBackupLabel = true;
@ -4989,10 +4991,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(DEBUG1, ereport(DEBUG1,
(errmsg("redo record is at %X/%X; shutdown %s", (errmsg("redo record is at %X/%X; shutdown %s",