Fix remote delta backup

knizhnik · knizhnik · commit be78ca6ee210 · 2019-01-18T00:37:18.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -819,7 +819,7 @@ do_backup_instance(void)
 		{
 			pgFile	   *file = (pgFile *) parray_get(xlog_files_list, i);
 			if (S_ISREG(file->mode))
-				calc_file_checksum(file);
+				calc_file_checksum(file, FIO_BACKUP_HOST);
 			/* Remove file path root prefix*/
 			if (strstr(file->path, database_path) == file->path)
 			{
@@ -2029,7 +2029,7 @@ pg_stop_backup(pgBackup *backup)
 			if (backup_files_list)
 			{
 				file = pgFileNew(backup_label, true, FIO_BACKUP_HOST);
-				calc_file_checksum(file);
+				calc_file_checksum(file, FIO_BACKUP_HOST);
 				free(file->path);
 				file->path = strdup(PG_BACKUP_LABEL_FILE);
 				parray_append(backup_files_list, file);
@@ -2073,7 +2073,7 @@ pg_stop_backup(pgBackup *backup)
 			{
 				file = pgFileNew(tablespace_map, true, FIO_BACKUP_HOST);
 				if (S_ISREG(file->mode))
-					calc_file_checksum(file);
+					calc_file_checksum(file, FIO_BACKUP_HOST);
 				free(file->path);
 				file->path = strdup(PG_TABLESPACE_MAP_FILE);
 				parray_append(backup_files_list, file);
@@ -2319,7 +2319,7 @@ backup_files(void *arg)
 				if (prev_file && file->exists_in_prev &&
 					buf.st_mtime < current.parent_backup)
 				{
-					calc_file_checksum(file);
+					calc_file_checksum(file, FIO_DB_HOST);
 					/* ...and checksum is the same... */
 					if (EQ_TRADITIONAL_CRC32(file->crc, (*prev_file)->crc))
 						skip = true; /* ...skip copying file. */
diff --git a/src/data.c b/src/data.c
@@ -1414,11 +1414,11 @@ get_wal_file(const char *from_path, const char *to_path)
  * PG_TABLESPACE_MAP_FILE and PG_BACKUP_LABEL_FILE.
  */
 void
-calc_file_checksum(pgFile *file)
+calc_file_checksum(pgFile *file, fio_location location)
 {
 	Assert(S_ISREG(file->mode));
 
-	file->crc = pgFileGetCRC(file->path, true, false, &file->read_size, FIO_BACKUP_HOST);
+	file->crc = pgFileGetCRC(file->path, true, false, &file->read_size, location);
 	file->write_size = file->read_size;
 }
 
diff --git a/src/pg_probackup.h b/src/pg_probackup.h
@@ -555,7 +555,7 @@ extern void push_wal_file(const char *from_path, const char *to_path,
 						  bool is_compress, bool overwrite);
 extern void get_wal_file(const char *from_path, const char *to_path);
 
-extern void calc_file_checksum(pgFile *file);
+extern void calc_file_checksum(pgFile *file, fio_location location);
 
 extern bool check_file_pages(pgFile *file, XLogRecPtr stop_lsn,
 							 uint32 checksum_version, uint32 backup_version);

Original file line number	Diff line number	Diff line change
`@@ -1414,11 +1414,11 @@ get_wal_file(const char from_path, const char to_path)`
`1414`	`1414`	`* PG_TABLESPACE_MAP_FILE and PG_BACKUP_LABEL_FILE.`
`1415`	`1415`	`*/`
`1416`	`1416`	`void`
`1417`		`-calc_file_checksum(pgFile *file)`
	`1417`	`+calc_file_checksum(pgFile *file, fio_location location)`
`1418`	`1418`	`{`
`1419`	`1419`	`Assert(S_ISREG(file->mode));`
`1420`	`1420`
`1421`		`- file->crc = pgFileGetCRC(file->path, true, false, &file->read_size, FIO_BACKUP_HOST);`
	`1421`	`+ file->crc = pgFileGetCRC(file->path, true, false, &file->read_size, location);`
`1422`	`1422`	`file->write_size = file->read_size;`
`1423`	`1423`	`}`
`1424`	`1424`