Commit492a856

Artur Zakirov

committed

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

2 parentsaa27178 +8775a39 commit492a856Copy full SHA for 492a856

File tree

+10

-3

lines changed

+10

-3

lines changed

Lines changed: 4 additions & 3 deletions

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`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,12 @@ do_show(time_t backup_id)`
`68`	`68`	`int`
`69`	`69`	`do_retention_show(void)`
`70`	`70`	`{`
	`71`	`+if (retention_redundancy==0&&retention_window==0)`
	`72`	`+{`
	`73`	`+fprintf(stdout,"No retention policy is set\n");`
	`74`	`+return0;`
	`75`	`+}`
	`76`	`+`
`71`	`77`	`fprintf(stdout,"# retention policy\n");`
`72`	`78`	`if (retention_redundancy>0)`
`73`	`79`	`fprintf(stdout,"REDUNDANCY=%u\n",retention_redundancy);`

Comments

(0)