NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9dba66c

committed

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

location read from backup label file can be found: wasShutdown was setincorrectly when a backup label file was found.Jeff Davis, with a little tweaking by me.

1 parent01670b8 commit9dba66cCopy full SHA for 9dba66c

File tree

1 file changed

-1

lines changed

src/backend/access/transam
- xlog.c

1 file changed

-1

lines changed

`‎src/backend/access/transam/xlog.c`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5830,6 +5830,7 @@ StartupXLOG(void)`
`5830`	`5830`	`if (record!=NULL)`
`5831`	`5831`	`{`
`5832`	`5832`	`memcpy(&checkPoint,XLogRecGetData(record),sizeof(CheckPoint));`
	`5833`	`+wasShutdown= (record->xl_info==XLOG_CHECKPOINT_SHUTDOWN);`
`5833`	`5834`	`ereport(DEBUG1,`
`5834`	`5835`	`(errmsg("checkpoint record is at %X/%X",`
`5835`	`5836`	`checkPointLoc.xlogid,checkPointLoc.xrecoff)));`
`@@ -5854,6 +5855,7 @@ StartupXLOG(void)`
`5854`	`5855`	`ereport(FATAL,`
`5855`	`5856`	`(errmsg("could not locate required checkpoint record"),`
`5856`	`5857`	`errhint("If you are not restoring from a backup, try removing the file \"%s/backup_label\".",DataDir)));`
	`5858`	`+wasShutdown= false;/* keep compiler quiet */`
`5857`	`5859`	`}`
`5858`	`5860`	`/* set flag to delete it later */`
`5859`	`5861`	`haveBackupLabel= true;`
`@@ -5898,10 +5900,10 @@ StartupXLOG(void)`
`5898`	`5900`	`(errmsg("could not locate a valid checkpoint record")));`
`5899`	`5901`	`}`
`5900`	`5902`	`memcpy(&checkPoint,XLogRecGetData(record),sizeof(CheckPoint));`
	`5903`	`+wasShutdown= (record->xl_info==XLOG_CHECKPOINT_SHUTDOWN);`
`5901`	`5904`	`}`
`5902`	`5905`
`5903`	`5906`	`LastRec=RecPtr=checkPointLoc;`
`5904`		`-wasShutdown= (record->xl_info==XLOG_CHECKPOINT_SHUTDOWN);`
`5905`	`5907`
`5906`	`5908`	`ereport(DEBUG1,`
`5907`	`5909`	`(errmsg("redo record is at %X/%X; shutdown %s",`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9dba66c

File tree

1 file changed

1 file changed

`‎src/backend/access/transam/xlog.c`

0 commit comments