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

Commit5ce108b

Browse files
committed
Track the timeline associated with minRecoveryPoint, for more sanity checks.
This allows recovery to notice certain incorrect recovery scenarios.If a server has recovered to point X on timeline 5, and you restartrecovery, it better be on timeline 5 when it reaches point X again, not onsome timeline with a higher ID. This can happen e.g if you a standby serveris shut down, a new timeline appears in the WAL archive, and the standbyserver is restarted. It will try to follow the new timeline, which is wrongbecause some WAL on the old timeline was already replayed before shutdown.Requires an initdb (or at least pg_resetxlog), because this adds a field tothe control file.
1 parent2f22765 commit5ce108b

File tree

4 files changed

+68
-5
lines changed

4 files changed

+68
-5
lines changed

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

Lines changed: 62 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@ typedef struct XLogCtlData
447447

448448
/* end+1 of the last record replayed (or being replayed) */
449449
XLogRecPtrreplayEndRecPtr;
450+
TimeLineIDreplayEndTLI;
450451
/* end+1 of the last record replayed */
451452
XLogRecPtrrecoveryLastRecPtr;
452453
/* timestamp of last COMMIT/ABORT record replayed (or being replayed) */
@@ -580,6 +581,7 @@ static TimeLineID lastSegmentTLI = 0;
580581

581582
staticXLogRecPtrminRecoveryPoint;/* local copy of
582583
* ControlFile->minRecoveryPoint */
584+
staticTimeLineIDminRecoveryPointTLI;
583585
staticboolupdateMinRecoveryPoint= true;
584586

585587
/*
@@ -1778,6 +1780,7 @@ UpdateMinRecoveryPoint(XLogRecPtr lsn, bool force)
17781780

17791781
/* update local copy */
17801782
minRecoveryPoint=ControlFile->minRecoveryPoint;
1783+
minRecoveryPointTLI=ControlFile->minRecoveryPointTLI;
17811784

17821785
/*
17831786
* An invalid minRecoveryPoint means that we need to recover all the WAL,
@@ -1791,6 +1794,7 @@ UpdateMinRecoveryPoint(XLogRecPtr lsn, bool force)
17911794
/* use volatile pointer to prevent code rearrangement */
17921795
volatileXLogCtlData*xlogctl=XLogCtl;
17931796
XLogRecPtrnewMinRecoveryPoint;
1797+
TimeLineIDnewMinRecoveryPointTLI;
17941798

17951799
/*
17961800
* To avoid having to update the control file too often, we update it
@@ -1807,6 +1811,7 @@ UpdateMinRecoveryPoint(XLogRecPtr lsn, bool force)
18071811
*/
18081812
SpinLockAcquire(&xlogctl->info_lck);
18091813
newMinRecoveryPoint=xlogctl->replayEndRecPtr;
1814+
newMinRecoveryPointTLI=xlogctl->replayEndTLI;
18101815
SpinLockRelease(&xlogctl->info_lck);
18111816

18121817
if (!force&&XLByteLT(newMinRecoveryPoint,lsn))
@@ -1820,13 +1825,16 @@ UpdateMinRecoveryPoint(XLogRecPtr lsn, bool force)
18201825
if (XLByteLT(ControlFile->minRecoveryPoint,newMinRecoveryPoint))
18211826
{
18221827
ControlFile->minRecoveryPoint=newMinRecoveryPoint;
1828+
ControlFile->minRecoveryPointTLI=newMinRecoveryPointTLI;
18231829
UpdateControlFile();
18241830
minRecoveryPoint=newMinRecoveryPoint;
1831+
minRecoveryPointTLI=newMinRecoveryPointTLI;
18251832

18261833
ereport(DEBUG2,
1827-
(errmsg("updated min recovery point to %X/%X",
1834+
(errmsg("updated min recovery point to %X/%X on timeline %u",
18281835
(uint32) (minRecoveryPoint >>32),
1829-
(uint32)minRecoveryPoint)));
1836+
(uint32)minRecoveryPoint,
1837+
newMinRecoveryPointTLI)));
18301838
}
18311839
}
18321840
LWLockRelease(ControlFileLock);
@@ -2132,6 +2140,7 @@ XLogNeedsFlush(XLogRecPtr record)
21322140
if (!LWLockConditionalAcquire(ControlFileLock,LW_SHARED))
21332141
return true;
21342142
minRecoveryPoint=ControlFile->minRecoveryPoint;
2143+
minRecoveryPointTLI=ControlFile->minRecoveryPointTLI;
21352144
LWLockRelease(ControlFileLock);
21362145

21372146
/*
@@ -5305,6 +5314,19 @@ StartupXLOG(void)
53055314
recoveryTargetTLI,
53065315
ControlFile->checkPointCopy.ThisTimeLineID)));
53075316

5317+
/*
5318+
* The min recovery point should be part of the requested timeline's
5319+
* history, too.
5320+
*/
5321+
if (!XLogRecPtrIsInvalid(ControlFile->minRecoveryPoint)&&
5322+
!list_member_int(expectedTLIs,ControlFile->minRecoveryPointTLI))
5323+
ereport(FATAL,
5324+
(errmsg("requested timeline %u does not contain minimum recovery point %X/%X on timeline %u",
5325+
recoveryTargetTLI,
5326+
(uint32) (ControlFile->minRecoveryPoint >>32),
5327+
(uint32)ControlFile->minRecoveryPoint,
5328+
ControlFile->minRecoveryPointTLI)));
5329+
53085330
/*
53095331
* Save the selected recovery target timeline ID and
53105332
* archive_cleanup_command in shared memory so that other processes can
@@ -5523,7 +5545,10 @@ StartupXLOG(void)
55235545
{
55245546
/* initialize minRecoveryPoint if not set yet */
55255547
if (XLByteLT(ControlFile->minRecoveryPoint,checkPoint.redo))
5548+
{
55265549
ControlFile->minRecoveryPoint=checkPoint.redo;
5550+
ControlFile->minRecoveryPointTLI=checkPoint.ThisTimeLineID;
5551+
}
55275552
}
55285553

55295554
/*
@@ -5556,6 +5581,7 @@ StartupXLOG(void)
55565581

55575582
/* initialize our local copy of minRecoveryPoint */
55585583
minRecoveryPoint=ControlFile->minRecoveryPoint;
5584+
minRecoveryPointTLI=ControlFile->minRecoveryPointTLI;
55595585

55605586
/*
55615587
* Reset pgstat data, because it may be invalid after recovery.
@@ -5681,6 +5707,7 @@ StartupXLOG(void)
56815707
*/
56825708
SpinLockAcquire(&xlogctl->info_lck);
56835709
xlogctl->replayEndRecPtr=ReadRecPtr;
5710+
xlogctl->replayEndTLI=ThisTimeLineID;
56845711
xlogctl->recoveryLastRecPtr=EndRecPtr;
56855712
xlogctl->recoveryLastXTime=0;
56865713
xlogctl->currentChunkStartTime=0;
@@ -7202,6 +7229,7 @@ CreateCheckPoint(int flags)
72027229
ControlFile->time= (pg_time_t)time(NULL);
72037230
/* crash recovery should always recover to the end of WAL */
72047231
MemSet(&ControlFile->minRecoveryPoint,0,sizeof(XLogRecPtr));
7232+
ControlFile->minRecoveryPointTLI=0;
72057233
UpdateControlFile();
72067234
LWLockRelease(ControlFileLock);
72077235

@@ -7878,16 +7906,42 @@ xlog_redo(XLogRecPtr lsn, XLogRecord *record)
78787906
}
78797907

78807908
/*
7881-
* TLI may change in a shutdown checkpoint, but it shouldn't decrease
7909+
* TLI may change in a shutdown checkpoint.
78827910
*/
78837911
if (checkPoint.ThisTimeLineID!=ThisTimeLineID)
78847912
{
7913+
/*
7914+
* The new timeline better be in the list of timelines we expect
7915+
* to see, according to the timeline history. It should also not
7916+
* decrease.
7917+
*/
78857918
if (checkPoint.ThisTimeLineID<ThisTimeLineID||
78867919
!list_member_int(expectedTLIs,
78877920
(int)checkPoint.ThisTimeLineID))
78887921
ereport(PANIC,
78897922
(errmsg("unexpected timeline ID %u (after %u) in checkpoint record",
78907923
checkPoint.ThisTimeLineID,ThisTimeLineID)));
7924+
7925+
/*
7926+
* If we have not yet reached min recovery point, and we're about
7927+
* to switch to a timeline greater than the timeline of the min
7928+
* recovery point: trouble. After switching to the new timeline,
7929+
* we could not possibly visit the min recovery point on the
7930+
* correct timeline anymore. This can happen if there is a newer
7931+
* timeline in the archive that branched before the timeline the
7932+
* min recovery point is on, and you attempt to do PITR to the
7933+
* new timeline.
7934+
*/
7935+
if (!XLogRecPtrIsInvalid(minRecoveryPoint)&&
7936+
XLByteLT(lsn,minRecoveryPoint)&&
7937+
checkPoint.ThisTimeLineID>minRecoveryPointTLI)
7938+
ereport(PANIC,
7939+
(errmsg("unexpected timeline ID %u in checkpoint record, before reaching minimum recovery point %X/%X on timeline %u",
7940+
checkPoint.ThisTimeLineID,
7941+
(uint32) (minRecoveryPoint >>32),
7942+
(uint32)minRecoveryPoint,
7943+
minRecoveryPointTLI)));
7944+
78917945
/* Following WAL records should be run with new TLI */
78927946
ThisTimeLineID=checkPoint.ThisTimeLineID;
78937947
}
@@ -7972,7 +8026,10 @@ xlog_redo(XLogRecPtr lsn, XLogRecord *record)
79728026
LWLockAcquire(ControlFileLock,LW_EXCLUSIVE);
79738027

79748028
if (XLByteLT(ControlFile->minRecoveryPoint,lsn))
8029+
{
79758030
ControlFile->minRecoveryPoint=lsn;
8031+
ControlFile->minRecoveryPointTLI=ThisTimeLineID;
8032+
}
79768033
MemSet(&ControlFile->backupStartPoint,0,sizeof(XLogRecPtr));
79778034
ControlFile->backupEndRequired= false;
79788035
UpdateControlFile();
@@ -8002,9 +8059,11 @@ xlog_redo(XLogRecPtr lsn, XLogRecord *record)
80028059
* decreasing max_* settings.
80038060
*/
80048061
minRecoveryPoint=ControlFile->minRecoveryPoint;
8062+
minRecoveryPointTLI=ControlFile->minRecoveryPointTLI;
80058063
if (minRecoveryPoint!=0&&XLByteLT(minRecoveryPoint,lsn))
80068064
{
80078065
ControlFile->minRecoveryPoint=lsn;
8066+
ControlFile->minRecoveryPointTLI=ThisTimeLineID;
80088067
}
80098068

80108069
UpdateControlFile();

‎src/bin/pg_controldata/pg_controldata.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,11 @@ main(int argc, char *argv[])
234234
ControlFile.checkPointCopy.oldestActiveXid);
235235
printf(_("Time of latest checkpoint: %s\n"),
236236
ckpttime_str);
237-
printf(_("Minimum recovery ending location: %X/%X\n"),
237+
printf(_("Min recovery ending location: %X/%X\n"),
238238
(uint32) (ControlFile.minRecoveryPoint >>32),
239239
(uint32)ControlFile.minRecoveryPoint);
240+
printf(_("Min recovery ending loc's timeline: %u\n"),
241+
ControlFile.minRecoveryPointTLI);
240242
printf(_("Backup start location: %X/%X\n"),
241243
(uint32) (ControlFile.backupStartPoint >>32),
242244
(uint32)ControlFile.backupStartPoint);

‎src/bin/pg_resetxlog/pg_resetxlog.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -610,6 +610,7 @@ RewriteControlFile(void)
610610
ControlFile.checkPoint=ControlFile.checkPointCopy.redo;
611611
ControlFile.prevCheckPoint=0;
612612
ControlFile.minRecoveryPoint=0;
613+
ControlFile.minRecoveryPointTLI=0;
613614
ControlFile.backupStartPoint=0;
614615
ControlFile.backupEndPoint=0;
615616
ControlFile.backupEndRequired= false;

‎src/include/catalog/pg_control.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222

2323
/* Version identifier for this pg_control format */
24-
#definePG_CONTROL_VERSION931
24+
#definePG_CONTROL_VERSION932
2525

2626
/*
2727
* Body of CheckPoint XLOG records. This is declared here because we keep
@@ -153,6 +153,7 @@ typedef struct ControlFileData
153153
* pg_start_backup() call, not accompanied by pg_stop_backup().
154154
*/
155155
XLogRecPtrminRecoveryPoint;
156+
TimeLineIDminRecoveryPointTLI;
156157
XLogRecPtrbackupStartPoint;
157158
XLogRecPtrbackupEndPoint;
158159
boolbackupEndRequired;

0 commit comments

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