Fix checksums for segno > 0

stalkerg · stalkerg · commit f69e780d37b6 · 2016-09-06T16:30:54.000+03:00
diff --git a/backup.c b/backup.c
@@ -1106,6 +1106,20 @@ add_files(parray *files, const char *root, bool add_root, bool is_pgdata)
 			continue;
 
 		file->is_datafile = true;
+		{
+			int find_dot;
+			char *text_segno;
+			for(find_dot = path_len-1; file->path[find_dot] != '.' && find_dot >= 0; find_dot--);
+			if (find_dot <= 0)
+				continue;
+
+			text_segno = file->path + find_dot + 1;
+			/* in future we will need check all chars */
+			if (!isdigit(text_segno[0]))
+				continue;
+
+			file->segno = (int) strtol(text_segno, NULL, 10);
+		}
 	}
 	parray_concat(files, list_file);
 }
diff --git a/data.c b/data.c
@@ -185,8 +185,9 @@ backup_data_file(const char *from_root, const char *to_root,
 						elog(ERROR, "File: %s blknum %u have wrong page header.", file->path, blknum);
 				}
 
+
 				if(current.checksum_version &&
-				   pg_checksum_page(page.data, header.block) != ((PageHeader) page.data)->pd_checksum)
+				   pg_checksum_page(page.data, file->segno * RELSEG_SIZE + blknum) != ((PageHeader) page.data)->pd_checksum)
 				{
 					if (try_checksum)
 					{
@@ -307,7 +308,7 @@ backup_data_file(const char *from_root, const char *to_root,
 				}
 
 				if(current.checksum_version &&
-				   pg_checksum_page(page.data, header.block) != ((PageHeader) page.data)->pd_checksum)
+				   pg_checksum_page(page.data, file->segno * RELSEG_SIZE + blknum) != ((PageHeader) page.data)->pd_checksum)
 				{
 					if (try_checksum)
 						elog(WARNING, "File: %s blknum %u have wrong checksum, try again", file->path, blknum);

Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,9 @@ backup_data_file(const char from_root, const char to_root,`
`185`	`185`	`elog(ERROR, "File: %s blknum %u have wrong page header.", file->path, blknum);`
`186`	`186`	`}`
`187`	`187`
	`188`	`+`
`188`	`189`	`if(current.checksum_version &&`
`189`		`- pg_checksum_page(page.data, header.block) != ((PageHeader) page.data)->pd_checksum)`
	`190`	`+ pg_checksum_page(page.data, file->segno * RELSEG_SIZE + blknum) != ((PageHeader) page.data)->pd_checksum)`
`190`	`191`	`{`
`191`	`192`	`if (try_checksum)`
`192`	`193`	`{`
`@@ -307,7 +308,7 @@ backup_data_file(const char from_root, const char to_root,`
`307`	`308`	`}`
`308`	`309`
`309`	`310`	`if(current.checksum_version &&`
`310`		`- pg_checksum_page(page.data, header.block) != ((PageHeader) page.data)->pd_checksum)`
	`311`	`+ pg_checksum_page(page.data, file->segno * RELSEG_SIZE + blknum) != ((PageHeader) page.data)->pd_checksum)`
`311`	`312`	`{`
`312`	`313`	`if (try_checksum)`
`313`	`314`	`elog(WARNING, "File: %s blknum %u have wrong checksum, try again", file->path, blknum);`