Add checksums database support.

stalkerg · stalkerg · commit 356ebd372822 · 2016-07-07T18:38:56.000+03:00
diff --git a/backup.c b/backup.c
@@ -461,6 +461,7 @@ do_backup(pgBackupOption bkupopt)
 	current.wal_block_size = XLOG_BLCKSZ;
 	current.recovery_xid = 0;
 	current.recovery_time = (time_t) 0;
+	current.checksum_version = get_data_checksum_version(true);
 
 	/* create backup directory and backup.ini */
 	if (!check)
diff --git a/catalog.c b/catalog.c
@@ -329,6 +329,7 @@ pgBackupWriteResultSection(FILE *out, pgBackup *backup)
 				backup->data_bytes);
 	fprintf(out, "BLOCK_SIZE=%u\n", backup->block_size);
 	fprintf(out, "XLOG_BLOCK_SIZE=%u\n", backup->wal_block_size);
+	fprintf(out, "CHECKSUM_VERSION=%u\n", backup->checksum_version);
 
 	fprintf(out, "STATUS=%s\n", status2str(backup->status));
 }
@@ -383,6 +384,7 @@ catalog_read_ini(const char *path)
 		{ 'I', 0, "data-bytes"		, NULL, SOURCE_ENV },
 		{ 'u', 0, "block-size"			, NULL, SOURCE_ENV },
 		{ 'u', 0, "xlog-block-size"		, NULL, SOURCE_ENV },
+		{ 'u', 0, "checksum_version"		, NULL, SOURCE_ENV },
 		{ 's', 0, "status"				, NULL, SOURCE_ENV },
 		{ 0 }
 	};
@@ -405,6 +407,7 @@ catalog_read_ini(const char *path)
 	options[i++].var = &backup->data_bytes;
 	options[i++].var = &backup->block_size;
 	options[i++].var = &backup->wal_block_size;
+	options[i++].var = &backup->checksum_version;
 	options[i++].var = &status;
 	Assert(i == lengthof(options) - 1);
 
diff --git a/data.c b/data.c
@@ -17,6 +17,7 @@
 #include "libpq/pqsignal.h"
 #include "storage/block.h"
 #include "storage/bufpage.h"
+#include "storage/checksum_impl.h"
 
 typedef struct BackupPageHeader
 {
@@ -299,7 +300,8 @@ backup_data_file(const char *from_root, const char *to_root,
 void
 restore_data_file(const char *from_root,
 				  const char *to_root,
-				  pgFile *file)
+				  pgFile *file,
+				  pgBackup *backup)
 {
 	char				to_path[MAXPGPATH];
 	FILE			   *in;
@@ -386,6 +388,10 @@ restore_data_file(const char *from_root,
 				 blknum, file->path, strerror(errno));
 		}
 
+		/* update checksum because we are not save whole */
+		if(backup->checksum_version)
+			((PageHeader) page.data)->pd_checksum = pg_checksum_page(page.data, header.block);
+
 		/*
 		 * Seek and write the restored page. Backup might have holes in
 		 * differential backups.
diff --git a/pg_arman.h b/pg_arman.h
@@ -23,6 +23,7 @@
 #include "datapagemap.h"
 #include "storage/bufpage.h"
 #include "storage/block.h"
+#include "storage/checksum.h"
 
 /* Query to fetch current transaction ID */
 #define TXID_CURRENT_SQL	"SELECT txid_current();"
@@ -140,6 +141,7 @@ typedef struct pgBackup
 	/* data/wal block size for compatibility check */
 	uint32		block_size;
 	uint32		wal_block_size;
+	uint32		checksum_version;
 } pgBackup;
 
 typedef struct pgBackupOption
@@ -288,7 +290,7 @@ extern int pgFileCompareMtimeDesc(const void *f1, const void *f2);
 extern bool backup_data_file(const char *from_root, const char *to_root,
 							 pgFile *file, const XLogRecPtr *lsn);
 extern void restore_data_file(const char *from_root, const char *to_root,
-							  pgFile *file);
+							  pgFile *file, pgBackup *backup);
 extern bool copy_file(const char *from_root, const char *to_root,
 					  pgFile *file);
 
@@ -306,6 +308,7 @@ 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);
+extern uint32 get_data_checksum_version(bool safe);
 
 /* in status.c */
 extern bool is_pg_running(void);
diff --git a/restore.c b/restore.c
@@ -437,7 +437,7 @@ restore_files(void *arg)
 
 		/* restore file */
 		if (!check)
-			restore_data_file(from_root, pgdata, file);
+			restore_data_file(from_root, pgdata, file, arguments->backup);
 
 		/* print size of restored file */
 		if (!check)
diff --git a/util.c b/util.c
@@ -111,6 +111,24 @@ get_current_timeline(bool safe)
 	return ControlFile.checkPointCopy.ThisTimeLineID;
 }
 
+uint32
+get_data_checksum_version(bool safe)
+{
+	ControlFileData ControlFile;
+	char       *buffer;
+	size_t      size;
+
+	/* First fetch file... */
+	buffer = slurpFile(pgdata, "global/pg_control", &size, safe);
+	if (buffer == NULL)
+		return 0;
+	digestControlFile(&ControlFile, buffer, size);
+	pg_free(buffer);
+
+	return ControlFile.data_checksum_version;
+}
+
+
 /*
  * Convert time_t value to ISO-8601 format string
  */
