Merge branch 'ptrack' of git.postgrespro.ru:pgpro-dev/pg_probackup into ptrack

Artur Zakirov · Artur Zakirov · commit 492a85606fac · 2017-02-15T20:44:38.000+03:00
diff --git a/data.c b/data.c
@@ -81,9 +81,10 @@ backup_data_page(pgFile *file, const XLogRecPtr *lsn,
 
 			if (st.st_size/BLCKSZ <= blknum)
 			{
-				elog(WARNING, "File: %s, file was truncated after backup start."
-							"Expected nblocks %u. Real nblocks %ld. Cannot read block %u ",
-							file->path, nblocks, st.st_size/BLCKSZ, blknum);
+				if (verbose)
+					elog(LOG, "File: %s, file was truncated after backup start."
+							  "Expected nblocks %u. Real nblocks %ld. Cannot read block %u ",
+							  file->path, nblocks, st.st_size/BLCKSZ, blknum);
 				return;
 			}
 			else
diff --git a/show.c b/show.c
@@ -68,6 +68,12 @@ do_show(time_t backup_id)
 int
 do_retention_show(void)
 {
+	if (retention_redundancy == 0 && retention_window == 0)
+	{
+		fprintf(stdout, "No retention policy is set\n");
+		return 0;
+	}
+
 	fprintf(stdout, "# retention policy\n");
 	if (retention_redundancy > 0)
 		fprintf(stdout, "REDUNDANCY=%u\n", retention_redundancy);

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,10 @@ backup_data_page(pgFile file, const XLogRecPtr lsn,`
`81`	`81`
`82`	`82`	`if (st.st_size/BLCKSZ <= blknum)`
`83`	`83`	`{`
`84`		`- elog(WARNING, "File: %s, file was truncated after backup start."`
`85`		`- "Expected nblocks %u. Real nblocks %ld. Cannot read block %u ",`
`86`		`- file->path, nblocks, st.st_size/BLCKSZ, blknum);`
	`84`	`+ if (verbose)`
	`85`	`+ elog(LOG, "File: %s, file was truncated after backup start."`
	`86`	`+ "Expected nblocks %u. Real nblocks %ld. Cannot read block %u ",`
	`87`	`+ file->path, nblocks, st.st_size/BLCKSZ, blknum);`
`87`	`88`	`return;`
`88`	`89`	`}`
`89`	`90`	`else`