Skip to content

Do not create new timeline for replica promotion #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2025
Merged

Do not create new timeline for replica promotion #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/backend/access/transam/xlog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6066,7 +6066,7 @@ StartupXLOG(void)
* In a normal crash recovery, we can just extend the timeline we were in.
*/
newTLI = endOfRecoveryInfo->lastRecTLI;
if (ArchiveRecoveryRequested)
if (ArchiveRecoveryRequested && !NeonRecoveryRequested)
{
newTLI = findNewestTimeLine(recoveryTargetTLI) + 1;
ereport(LOG,
Expand Down
44 changes: 24 additions & 20 deletions src/backend/access/transam/xlogrecovery.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1699,29 +1699,33 @@ FinishWalRecovery(void)
char *page = palloc0(offs);
XLogPageHeader xlogPageHdr = (XLogPageHeader) page;

xlogPageHdr->xlp_pageaddr = pageBeginPtr;
xlogPageHdr->xlp_magic = XLOG_PAGE_MAGIC;
xlogPageHdr->xlp_tli = recoveryTargetTLI;
xlogPageHdr->xlp_info = 0;
/*
* If we start writing with offset from page beginning, pretend in
* page header there is a record ending where actual data will
* start.
*/
xlogPageHdr->xlp_rem_len = offs - lastPageSize;
if (xlogPageHdr->xlp_rem_len > 0)
xlogPageHdr->xlp_info |= XLP_FIRST_IS_CONTRECORD;
readOff = XLogSegmentOffset(pageBeginPtr, wal_segment_size);

if (isLongHeader)
memcpy(page, xlogreader->readBuf, offs);
if (xlogPageHdr->xlp_magic != XLOG_PAGE_MAGIC)
{
XLogLongPageHeader longHdr = (XLogLongPageHeader) page;
xlogPageHdr->xlp_pageaddr = pageBeginPtr;
xlogPageHdr->xlp_magic = XLOG_PAGE_MAGIC;
xlogPageHdr->xlp_tli = recoveryTargetTLI;
xlogPageHdr->xlp_info = 0;
/*
* If we start writing with offset from page beginning, pretend in
* page header there is a record ending where actual data will
* start.
*/
xlogPageHdr->xlp_rem_len = offs - lastPageSize;
if (xlogPageHdr->xlp_rem_len > 0)
xlogPageHdr->xlp_info |= XLP_FIRST_IS_CONTRECORD;
readOff = XLogSegmentOffset(pageBeginPtr, wal_segment_size);

if (isLongHeader)
{
XLogLongPageHeader longHdr = (XLogLongPageHeader) page;

longHdr->xlp_sysid = GetSystemIdentifier();
longHdr->xlp_seg_size = wal_segment_size;
longHdr->xlp_xlog_blcksz = XLOG_BLCKSZ;
longHdr->xlp_sysid = GetSystemIdentifier();
longHdr->xlp_seg_size = wal_segment_size;
longHdr->xlp_xlog_blcksz = XLOG_BLCKSZ;

xlogPageHdr->xlp_info |= XLP_LONG_HEADER;
xlogPageHdr->xlp_info |= XLP_LONG_HEADER;
}
}
result->lastPageBeginPtr = pageBeginPtr;
result->lastPage = page;
Expand Down