db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-07-05 05:50:16 +02:00
Code Issues Releases Activity

Check ptrack control file.

Browse Source
This commit is contained in:
Zhuravlev Uriy aka stalkerg
2016-03-10 17:40:33 +03:00
parent 633b4b5c55
commit 30845bf4a6
4 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backup.c
View File

@ -230,6 +230,12 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)
if (current.backup_mode == BACKUP_MODE_DIFF_PTRACK) if (current.backup_mode == BACKUP_MODE_DIFF_PTRACK)
{ {
XLogRecPtr ptrack_lsn = get_last_ptrack_lsn();
if (ptrack_lsn < prev_backup->start_lsn || ptrack_lsn >= current.start_lsn)
elog(ERROR, "Wrong ptrack lsn:%lx prev:%lx current:%lx",
ptrack_lsn,
prev_backup->start_lsn,
current.start_lsn);
parray_qsort(backup_files_list, pgFileComparePathDesc); parray_qsort(backup_files_list, pgFileComparePathDesc);
make_pagemap_from_ptrack(backup_files_list); make_pagemap_from_ptrack(backup_files_list);
} }

2
parsexlog.c
View File

@ -107,11 +107,9 @@ SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
{ {
XLogPageReadPrivate *private = (XLogPageReadPrivate *) xlogreader->private_data; XLogPageReadPrivate *private = (XLogPageReadPrivate *) xlogreader->private_data;
uint32 targetPageOff; uint32 targetPageOff;
XLogRecPtr targetSegEnd;
XLogSegNo targetSegNo; XLogSegNo targetSegNo;
XLByteToSeg(targetPagePtr, targetSegNo); XLByteToSeg(targetPagePtr, targetSegNo);
XLogSegNoOffsetToRecPtr(targetSegNo + 1, 0, targetSegEnd);
targetPageOff = targetPagePtr % XLogSegSize; targetPageOff = targetPagePtr % XLogSegSize;
/* /*

1
pg_arman.h
View File

@ -298,6 +298,7 @@ extern void time2iso(char *buf, size_t len, time_t time);
extern const char *status2str(BackupStatus status); extern const char *status2str(BackupStatus status);
extern void remove_trailing_space(char *buf, int comment_mark); extern void remove_trailing_space(char *buf, int comment_mark);
extern void remove_not_digit(char *buf, size_t len, const char *str); extern void remove_not_digit(char *buf, size_t len, const char *str);
extern XLogRecPtr get_last_ptrack_lsn(void);
/* in status.c */ /* in status.c */
extern bool is_pg_running(void); extern bool is_pg_running(void);

15
util.c
View File

@ -75,6 +75,21 @@ sanityChecks(void)
"target master need to use either data checksums or \"wal_log_hints = on\"."); "target master need to use either data checksums or \"wal_log_hints = on\".");
} }
XLogRecPtr
get_last_ptrack_lsn(void)
{
char *buffer;
size_t size;
XLogRecPtr lsn;
buffer = slurpFile(pgdata, "global/ptrack_control", &size, false);
if (buffer == NULL)
return 0;
lsn = *(XLogRecPtr *)buffer;
return lsn;
}
/* /*
* Utility shared by backup and restore to fetch the current timeline * Utility shared by backup and restore to fetch the current timeline
* used by a node. * used by a node.