Skip to content

Commit 0e54a5e

Browse files
committed
Prevent WAL corruption after a standby promotion.
When a PostgreSQL instance performing archive recovery but not using standby mode is promoted, and the last WAL segment that it attempted to read ended in a partial record, the previous code would create invalid WAL on the new timeline. The WAL from the previously timeline would be copied to the new timeline up until the end of the last valid record, but instead of beginning to write WAL at immediately afterwards, the promoted server would write an overwrite contrecord at the beginning of the next segment. The end of the previous segment would be left as all-zeroes, resulting in failures if anything tried to read WAL from that file. The root of the issue is that ReadRecord() decides whether to set abortedRecPtr and missingContrecPtr based on the value of StandbyMode, but ReadRecord() switches to a new timeline based on the value of ArchiveRecoveryRequested. We shouldn't try to write an overwrite contrecord if we're switching to a new timeline, so change the test in ReadRecod() to check ArchiveRecoveryRequested instead. Code fix by Dilip Kumar. Comments by me incorporating suggested language from Álvaro Herrera. Further review from Kyotaro Horiguchi and Sami Imseih. Discussion: http://postgr.es/m/CAFiTN-t7umki=PK8dT1tcPV=mOUe2vNhHML6b3T7W7qqvvajjg@mail.gmail.com Discussion: http://postgr.es/m/FB0DEA0B-E14E-43A0-811F-C1AE93D00FF3%40amazon.com
1 parent 7f5dd42 commit 0e54a5e

File tree

1 file changed

+19
-5
lines changed
  • src/backend/access/transam

1 file changed

+19
-5
lines changed

src/backend/access/transam/xlog.c

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4419,12 +4419,18 @@ ReadRecord(XLogReaderState *xlogreader, int emode,
44194419
if (record == NULL)
44204420
{
44214421
/*
4422-
* When not in standby mode we find that WAL ends in an incomplete
4423-
* record, keep track of that record. After recovery is done,
4424-
* we'll write a record to indicate downstream WAL readers that
4425-
* that portion is to be ignored.
4422+
* When we find that WAL ends in an incomplete record, keep track
4423+
* of that record. After recovery is done, we'll write a record to
4424+
* indicate to downstream WAL readers that that portion is to be
4425+
* ignored.
4426+
*
4427+
* However, when ArchiveRecoveryRequested = true, we're going to
4428+
* switch to a new timeline at the end of recovery. We will only
4429+
* copy WAL over to the new timeline up to the end of the last
4430+
* complete record, so if we did this, we would later create an
4431+
* overwrite contrecord in the wrong place, breaking everything.
44264432
*/
4427-
if (!StandbyMode &&
4433+
if (!ArchiveRecoveryRequested &&
44284434
!XLogRecPtrIsInvalid(xlogreader->abortedRecPtr))
44294435
{
44304436
abortedRecPtr = xlogreader->abortedRecPtr;
@@ -7866,6 +7872,14 @@ StartupXLOG(void)
78667872
*/
78677873
if (!XLogRecPtrIsInvalid(missingContrecPtr))
78687874
{
7875+
/*
7876+
* We should only have a missingContrecPtr if we're not switching to
7877+
* a new timeline. When a timeline switch occurs, WAL is copied from
7878+
* the old timeline to the new only up to the end of the last complete
7879+
* record, so there can't be an incomplete WAL record that we need to
7880+
* disregard.
7881+
*/
7882+
Assert(ThisTimeLineID == PrevTimeLineID);
78697883
Assert(!XLogRecPtrIsInvalid(abortedRecPtr));
78707884
EndOfLog = missingContrecPtr;
78717885
}

0 commit comments

Comments
 (0)