Skip to content

Fix WAL validation for multi-timeline recovery targets #4

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
vbp1 merged 1 commit into from
Dec 25, 2025
Merged

Fix WAL validation for multi-timeline recovery targets #4

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
69 changes: 63 additions & 6 deletions src/parsexlog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "pg_probackup.h"

#include "access/transam.h"
#include "access/timeline.h"
#include "catalog/pg_control.h"
#include "commands/dbcommands_xlog.h"
#include "catalog/storage_xlog.h"
Expand Down Expand Up @@ -437,11 +438,11 @@ validate_wal(pgBackup *backup, const char *archivedir,
join_path_components(backup_database_dir, backup->root_dir, DATABASE_DIR);
join_path_components(backup_xlog_path, backup_database_dir, PG_XLOG_DIR);

validate_backup_wal_from_start_to_stop(backup, backup_xlog_path, tli,
validate_backup_wal_from_start_to_stop(backup, backup_xlog_path, backup->tli,
wal_seg_size);
}
else
validate_backup_wal_from_start_to_stop(backup, (char *) archivedir, tli,
validate_backup_wal_from_start_to_stop(backup, (char *) archivedir, backup->tli,
wal_seg_size);

if (backup->status == BACKUP_STATUS_CORRUPT)
Expand Down Expand Up @@ -486,10 +487,66 @@ validate_wal(pgBackup *backup, const char *archivedir,
|| (XRecOffIsValid(target_lsn) && last_rec.rec_lsn >= target_lsn))
all_wal = true;

all_wal = all_wal ||
RunXLogThreads(archivedir, target_time, target_xid, target_lsn,
tli, wal_seg_size, backup->stop_lsn,
InvalidXLogRecPtr, true, validateXLogRecord, &last_rec, true);
/*
* If target timeline differs from backup timeline, we need to validate
* WAL across multiple timelines. Read WAL on backup's timeline up to
* the switchpoint, then continue on target timeline.
*/
if (backup->tli != tli)
{
parray *timelines;
XLogRecPtr switchpoint = InvalidXLogRecPtr;
int i;

/* Read timeline history to find switchpoint */
timelines = read_timeline_history(archivedir, tli, false);
if (timelines)
{
for (i = 0; i < parray_num(timelines); i++)
{
TimeLineHistoryEntry *entry = parray_get(timelines, i);
if (entry->tli == backup->tli)
{
switchpoint = entry->end;
break;
}
}
/* Cleanup timeline history */
parray_walk(timelines, pg_free);
parray_free(timelines);
}

if (switchpoint != InvalidXLogRecPtr && backup->stop_lsn < switchpoint)
{
/* First, validate WAL from stop_lsn to switchpoint on backup's timeline */
all_wal = RunXLogThreads(archivedir, 0, InvalidTransactionId,
InvalidXLogRecPtr, backup->tli, wal_seg_size,
backup->stop_lsn, switchpoint,
true, validateXLogRecord, &last_rec, false);
if (all_wal)
{
/* Then validate from switchpoint to target on target timeline */
all_wal = RunXLogThreads(archivedir, target_time, target_xid, target_lsn,
tli, wal_seg_size, switchpoint,
InvalidXLogRecPtr, true, validateXLogRecord, &last_rec, true);
}
}
else
{
/* switchpoint not found or stop_lsn >= switchpoint, use single timeline */
all_wal = RunXLogThreads(archivedir, target_time, target_xid, target_lsn,
tli, wal_seg_size, backup->stop_lsn,
InvalidXLogRecPtr, true, validateXLogRecord, &last_rec, true);
}
}
else
{
/* Same timeline - simple case */
all_wal = all_wal ||
RunXLogThreads(archivedir, target_time, target_xid, target_lsn,
tli, wal_seg_size, backup->stop_lsn,
InvalidXLogRecPtr, true, validateXLogRecord, &last_rec, true);
}
if (last_rec.rec_time > 0)
time2iso(last_timestamp, lengthof(last_timestamp),
timestamptz_to_time_t(last_rec.rec_time), false);
Expand Down
3 changes: 2 additions & 1 deletion src/restore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,8 @@ do_restore_or_validate(InstanceState *instanceState, time_t target_backup_id, pg
*/
validate_wal(dest_backup, instanceState->instance_wal_subdir_path, rt->target_time,
rt->target_xid, rt->target_lsn,
dest_backup->tli, instance_config.xlog_seg_size);
rt->target_tli ? rt->target_tli : dest_backup->tli,
instance_config.xlog_seg_size);
}
/* Orphanize every OK descendant of corrupted backup */
else
Expand Down
5 changes: 2 additions & 3 deletions tests/validate_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3434,8 +3434,6 @@ def test_validate_corrupt_tablespace_map(self):
"\n Unexpected Error Message: {0}\n CMD: {1}".format(repr(e.message), self.cmd),
)

# TODO fix the test
@unittest.expectedFailure
# @unittest.skip("skip")
def test_validate_target_lsn(self):
"""
Expand Down Expand Up @@ -3468,11 +3466,12 @@ def test_validate_target_lsn(self):

self.restore_node(backup_dir, "node", node_restored)

self.set_archiving(backup_dir, "node", node_restored)
self.set_auto_conf(node_restored, {"port": node_restored.port})

node_restored.slow_start()

self.switch_wal_segment(node)
self.switch_wal_segment(node_restored)

backup_id = self.backup_node(backup_dir, "node", node_restored, data_dir=node_restored.data_dir)

Expand Down