1
0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-01-08 13:44:32 +02:00

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

This commit is contained in:
Artur Zakirov 2017-02-15 20:44:38 +03:00
commit 492a85606f
2 changed files with 10 additions and 3 deletions

7
data.c
View File

@ -81,9 +81,10 @@ backup_data_page(pgFile *file, const XLogRecPtr *lsn,
if (st.st_size/BLCKSZ <= blknum) if (st.st_size/BLCKSZ <= blknum)
{ {
elog(WARNING, "File: %s, file was truncated after backup start." if (verbose)
"Expected nblocks %u. Real nblocks %ld. Cannot read block %u ", elog(LOG, "File: %s, file was truncated after backup start."
file->path, nblocks, st.st_size/BLCKSZ, blknum); "Expected nblocks %u. Real nblocks %ld. Cannot read block %u ",
file->path, nblocks, st.st_size/BLCKSZ, blknum);
return; return;
} }
else else

6
show.c
View File

@ -68,6 +68,12 @@ do_show(time_t backup_id)
int int
do_retention_show(void) 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"); fprintf(stdout, "# retention policy\n");
if (retention_redundancy > 0) if (retention_redundancy > 0)
fprintf(stdout, "REDUNDANCY=%u\n", retention_redundancy); fprintf(stdout, "REDUNDANCY=%u\n", retention_redundancy);