Check ptrack control file.

stalkerg · stalkerg · commit 30845bf4a636 · 2016-03-10T17:40:33.000+03:00
diff --git a/backup.c b/backup.c
@@ -230,6 +230,12 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)
 
 	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);
 		make_pagemap_from_ptrack(backup_files_list);
 	}
diff --git a/parsexlog.c b/parsexlog.c
@@ -107,11 +107,9 @@ SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
 {
 	XLogPageReadPrivate *private = (XLogPageReadPrivate *) xlogreader->private_data;
 	uint32		targetPageOff;
-	XLogRecPtr	targetSegEnd;
 	XLogSegNo	targetSegNo;
 
 	XLByteToSeg(targetPagePtr, targetSegNo);
-	XLogSegNoOffsetToRecPtr(targetSegNo + 1, 0, targetSegEnd);
 	targetPageOff = targetPagePtr % XLogSegSize;
 
 	/*
diff --git a/pg_arman.h b/pg_arman.h
@@ -298,6 +298,7 @@ extern void time2iso(char *buf, size_t len, time_t time);
 extern const char *status2str(BackupStatus status);
 extern void remove_trailing_space(char *buf, int comment_mark);
 extern void remove_not_digit(char *buf, size_t len, const char *str);
+extern XLogRecPtr get_last_ptrack_lsn(void);
 
 /* in status.c */
 extern bool is_pg_running(void);
diff --git a/util.c b/util.c
@@ -75,6 +75,21 @@ sanityChecks(void)
 			 "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
  * used by a node.

Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,12 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)`
`230`	`230`
`231`	`231`	`if (current.backup_mode == BACKUP_MODE_DIFF_PTRACK)`
`232`	`232`	`{`
	`233`	`+ XLogRecPtr ptrack_lsn = get_last_ptrack_lsn();`
	`234`	`+ if (ptrack_lsn < prev_backup->start_lsn \|\| ptrack_lsn >= current.start_lsn)`
	`235`	`+ elog(ERROR, "Wrong ptrack lsn:%lx prev:%lx current:%lx",`
	`236`	`+ ptrack_lsn,`
	`237`	`+ prev_backup->start_lsn,`
	`238`	`+ current.start_lsn);`
`233`	`239`	`parray_qsort(backup_files_list, pgFileComparePathDesc);`
`234`	`240`	`make_pagemap_from_ptrack(backup_files_list);`
`235`	`241`	`}`