db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2024-11-25 09:01:48 +02:00
Code Issues Releases Activity

[Issue #118]: trust txid_snapshot_xmax() when determining recovery_xid

Browse Source
This commit is contained in:
Grigory Smolkin 2019-09-16 13:47:24 +03:00
parent 2413516389
commit 11ab44fb04
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backup.c
View File

@ -2019,6 +2019,7 @@ pg_stop_backup(pgBackup *backup, PGconn *pg_startbackup_conn,
xlog_path = arclog_path; xlog_path = arclog_path;
backup->stop_lsn = stop_backup_lsn; backup->stop_lsn = stop_backup_lsn;
backup->recovery_xid = recovery_xid;
elog(LOG, "Getting the Recovery Time from WAL"); elog(LOG, "Getting the Recovery Time from WAL");
@ -2026,11 +2027,10 @@ pg_stop_backup(pgBackup *backup, PGconn *pg_startbackup_conn,
if (!read_recovery_info(xlog_path, backup->tli, if (!read_recovery_info(xlog_path, backup->tli,
instance_config.xlog_seg_size, instance_config.xlog_seg_size,
backup->start_lsn, backup->stop_lsn, backup->start_lsn, backup->stop_lsn,
&backup->recovery_time, &backup->recovery_xid)) &backup->recovery_time))
{ {
elog(LOG, "Failed to find Recovery Time in WAL, forced to trust current_timestamp"); elog(LOG, "Failed to find Recovery Time in WAL, forced to trust current_timestamp");
backup->recovery_time = recovery_time; backup->recovery_time = recovery_time;
backup->recovery_xid = recovery_xid;
} }
} }
} }

3
src/parsexlog.c
View File

@ -425,7 +425,7 @@ validate_wal(pgBackup *backup, const char *archivedir,
bool bool
read_recovery_info(const char *archivedir, TimeLineID tli, uint32 wal_seg_size, read_recovery_info(const char *archivedir, TimeLineID tli, uint32 wal_seg_size,
XLogRecPtr start_lsn, XLogRecPtr stop_lsn, XLogRecPtr start_lsn, XLogRecPtr stop_lsn,
time_t *recovery_time, TransactionId *recovery_xid) time_t *recovery_time)
{ {
XLogRecPtr startpoint = stop_lsn; XLogRecPtr startpoint = stop_lsn;
XLogReaderState *xlogreader; XLogReaderState *xlogreader;
@ -472,7 +472,6 @@ read_recovery_info(const char *archivedir, TimeLineID tli, uint32 wal_seg_size,
if (getRecordTimestamp(xlogreader, &last_time)) if (getRecordTimestamp(xlogreader, &last_time))
{ {
*recovery_time = timestamptz_to_time_t(last_time); *recovery_time = timestamptz_to_time_t(last_time);
*recovery_xid = XLogRecGetXid(xlogreader);
/* Found timestamp in WAL record 'record' */ /* Found timestamp in WAL record 'record' */
res = true; res = true;

3
src/pg_probackup.h
View File

@ -707,8 +707,7 @@ extern void validate_wal(pgBackup *backup, const char *archivedir,
extern bool read_recovery_info(const char *archivedir, TimeLineID tli, extern bool read_recovery_info(const char *archivedir, TimeLineID tli,
uint32 seg_size, uint32 seg_size,
XLogRecPtr start_lsn, XLogRecPtr stop_lsn, XLogRecPtr start_lsn, XLogRecPtr stop_lsn,
time_t *recovery_time, time_t *recovery_time);
TransactionId *recovery_xid);
extern bool wal_contains_lsn(const char *archivedir, XLogRecPtr target_lsn, extern bool wal_contains_lsn(const char *archivedir, XLogRecPtr target_lsn,
TimeLineID target_tli, uint32 seg_size); TimeLineID target_tli, uint32 seg_size);
extern XLogRecPtr get_prior_record_lsn(const char *archivedir, XLogRecPtr start_lsn, extern XLogRecPtr get_prior_record_lsn(const char *archivedir, XLogRecPtr start_lsn,