Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite43f947

Browse files
committed
Check if we've reached end-of-backup point also if no redo is required.
If you restored from a backup taken from a standby, and the last record inthe backup is the checkpoint record, ie. there is no redo required exceptfor the checkpoint record, we would fail to notice that we've reached theend-of-backup point, and the database is consistent. The result was anerror "WAL ends before end of online backup". To fix, move thehave-we-reached-end-of-backup check into CheckRecoveryConsistency(), whichis already responsible for similar checks with minRecoveryPoint, and iscalled in the right places.Backpatch to 9.2, this check and bug did not exist before that.
1 parentf2b8808 commite43f947

File tree

1 file changed

+28
-21
lines changed
  • src/backend/access/transam

1 file changed

+28
-21
lines changed

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

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5963,27 +5963,6 @@ StartupXLOG(void)
59635963
/* Pop the error context stack */
59645964
error_context_stack=errcallback.previous;
59655965

5966-
if (!XLogRecPtrIsInvalid(ControlFile->backupEndPoint)&&
5967-
XLByteLE(ControlFile->backupEndPoint,EndRecPtr))
5968-
{
5969-
/*
5970-
* We have reached the end of base backup, the point where
5971-
* the minimum recovery point in pg_control indicates. The
5972-
* data on disk is now consistent. Reset backupStartPoint
5973-
* and backupEndPoint.
5974-
*/
5975-
elog(DEBUG1,"end of backup reached");
5976-
5977-
LWLockAcquire(ControlFileLock,LW_EXCLUSIVE);
5978-
5979-
MemSet(&ControlFile->backupStartPoint,0,sizeof(XLogRecPtr));
5980-
MemSet(&ControlFile->backupEndPoint,0,sizeof(XLogRecPtr));
5981-
ControlFile->backupEndRequired= false;
5982-
UpdateControlFile();
5983-
5984-
LWLockRelease(ControlFileLock);
5985-
}
5986-
59875966
/*
59885967
* Update lastReplayedEndRecPtr after this record has been
59895968
* successfully replayed.
@@ -6390,6 +6369,34 @@ CheckRecoveryConsistency(void)
63906369
if (XLogRecPtrIsInvalid(minRecoveryPoint))
63916370
return;
63926371

6372+
/*
6373+
* Have we reached the point where our base backup was completed?
6374+
*/
6375+
if (!XLogRecPtrIsInvalid(ControlFile->backupEndPoint)&&
6376+
XLByteLE(ControlFile->backupEndPoint,EndRecPtr))
6377+
{
6378+
/*
6379+
* We have reached the end of base backup, as indicated by pg_control.
6380+
* The data on disk is now consistent. Reset backupStartPoint and
6381+
* backupEndPoint, and update minRecoveryPoint to make sure we don't
6382+
* allow starting up at an earlier point even if recovery is stopped
6383+
* and restarted soon after this.
6384+
*/
6385+
elog(DEBUG1,"end of backup reached");
6386+
6387+
LWLockAcquire(ControlFileLock,LW_EXCLUSIVE);
6388+
6389+
if (XLByteLT(ControlFile->minRecoveryPoint,EndRecPtr))
6390+
ControlFile->minRecoveryPoint=EndRecPtr;
6391+
6392+
MemSet(&ControlFile->backupStartPoint,0,sizeof(XLogRecPtr));
6393+
MemSet(&ControlFile->backupEndPoint,0,sizeof(XLogRecPtr));
6394+
ControlFile->backupEndRequired= false;
6395+
UpdateControlFile();
6396+
6397+
LWLockRelease(ControlFileLock);
6398+
}
6399+
63936400
/*
63946401
* Have we passed our safe starting point? Note that minRecoveryPoint
63956402
* is known to be incorrectly set if ControlFile->backupEndRequired,

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp