NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitacf4740

committed

Check that we've reached end-of-backup also when we're not performing

archive recovery.It's possible to restore an online backup without recovery.conf, by simplycopying all the necessary WAL files to pg_xlog. "pg_basebackup -x" does thattoo. That's the use case where this cross-check is useful.Backpatch to 9.0. We used to do this in earlier versins, but in 9.0 the codewas inadvertently changed so that the check is only performed after archiverecovery.Fujii Masao.

1 parent754baa2 commitacf4740Copy full SHA for acf4740

File tree

1 file changed

-5

lines changed

src/backend/access/transam
- xlog.c

1 file changed

-5

lines changed

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

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -6256,8 +6256,7 @@ StartupXLOG(void)`
`6256`	`6256`	`}`
`6257`	`6257`
`6258`	`6258`	`/*`
`6259`		`- * set backupStartupPoint if we're starting archive recovery from a`
`6260`		`- * base backup`
	`6259`	`+ * set backupStartPoint if we're starting recovery from a base backup`
`6261`	`6260`	`*/`
`6262`	`6261`	`if (haveBackupLabel)`
`6263`	`6262`	`ControlFile->backupStartPoint=checkPoint.redo;`
`@@ -6610,7 +6609,7 @@ StartupXLOG(void)`
`6610`	`6609`	`* be further ahead --- ControlFile->minRecoveryPoint cannot have been`
`6611`	`6610`	`* advanced beyond the WAL we processed.`
`6612`	`6611`	`*/`
`6613`		`-if (InArchiveRecovery&&`
	`6612`	`+if (InRecovery&&`
`6614`	`6613`	`(XLByteLT(EndOfLog,minRecoveryPoint)\|\|`
`6615`	`6614`	`!XLogRecPtrIsInvalid(ControlFile->backupStartPoint)))`
`6616`	`6615`	`{`
`@@ -8311,8 +8310,7 @@ xlog_redo(XLogRecPtr lsn, XLogRecord *record)`
`8311`	`8310`	`* record, the backup was cancelled and the end-of-backup record will`
`8312`	`8311`	`* never arrive.`
`8313`	`8312`	`*/`
`8314`		`-if (InArchiveRecovery&&`
`8315`		`-!XLogRecPtrIsInvalid(ControlFile->backupStartPoint))`
	`8313`	`+if (!XLogRecPtrIsInvalid(ControlFile->backupStartPoint))`
`8316`	`8314`	`ereport(ERROR,`
`8317`	`8315`	`(errmsg("online backup was cancelled, recovery cannot continue")));`
`8318`	`8316`

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!

Commitacf4740

File tree

1 file changed

1 file changed

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

0 commit comments