Skip to content

Commit 3c0ef08

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 25ddf59 commit 3c0ef08

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
@@ -4321,12 +4321,18 @@ ReadRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr, int emode,
43214321
if (record == NULL)
43224322
{
43234323
/*
4324-
* When not in standby mode we find that WAL ends in an incomplete
4325-
* record, keep track of that record. After recovery is done,
4326-
* we'll write a record to indicate downstream WAL readers that
4327-
* that portion is to be ignored.
4324+
* When we find that WAL ends in an incomplete record, keep track
4325+
* of that record. After recovery is done, we'll write a record to
4326+
* indicate to downstream WAL readers that that portion is to be
4327+
* ignored.
4328+
*
4329+
* However, when ArchiveRecoveryRequested = true, we're going to
4330+
* switch to a new timeline at the end of recovery. We will only
4331+
* copy WAL over to the new timeline up to the end of the last
4332+
* complete record, so if we did this, we would later create an
4333+
* overwrite contrecord in the wrong place, breaking everything.
43284334
*/
4329-
if (!StandbyMode &&
4335+
if (!ArchiveRecoveryRequested &&
43304336
!XLogRecPtrIsInvalid(xlogreader->abortedRecPtr))
43314337
{
43324338
abortedRecPtr = xlogreader->abortedRecPtr;
@@ -7612,6 +7618,14 @@ StartupXLOG(void)
76127618
*/
76137619
if (!XLogRecPtrIsInvalid(missingContrecPtr))
76147620
{
7621+
/*
7622+
* We should only have a missingContrecPtr if we're not switching to
7623+
* a new timeline. When a timeline switch occurs, WAL is copied from
7624+
* the old timeline to the new only up to the end of the last complete
7625+
* record, so there can't be an incomplete WAL record that we need to
7626+
* disregard.
7627+
*/
7628+
Assert(ThisTimeLineID == PrevTimeLineID);
76157629
Assert(!XLogRecPtrIsInvalid(abortedRecPtr));
76167630
EndOfLog = missingContrecPtr;
76177631
}

0 commit comments

Comments
 (0)