Commitd10e5f1

committed

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

2 parentsd6b612e +4c1dde8 commitd10e5f1Copy full SHA for d10e5f1

File tree

-9

lines changed

-9

lines changed

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,9 @@ backup_data_page(pgFile file, const XLogRecPtr lsn,`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/*`
`95`		`-* If an invalid data page was found, fallback to simple copy to ensure`
`96`		`-* all pages in the file don't have BackupPageHeader.`
`97`		`-*/`
	`95`	`+* If an invalid data page was found, fallback to simple copy to ensure`
	`96`	`+* all pages in the file don't have BackupPageHeader.`
	`97`	`+*/`
`98`	`98`	`if (!parse_page(&page,&page_lsn))`
`99`	`99`	`{`
`100`	`100`	`inti;`
`@@ -234,9 +234,6 @@ backup_data_file(const char from_root, const char to_root,`
`234`	`234`	`to_path,strerror(errno_tmp));`
`235`	`235`	`}`
`236`	`236`
`237`		`-/* confirm server version */`
`238`		`-check_server_version();`
`239`		`-`
`240`	`237`	`/*`
`241`	`238`	`* Read each page, verify checksum and write it to backup.`
`242`	`239`	`* If page map is not empty we scan only these blocks, otherwise`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ do_deletewal(time_t backup_id, bool strict)`
`139`	`139`	`parray_walk(backup_list,pgBackupFree);`
`140`	`140`	`parray_free(backup_list);`
`141`	`141`
`142`		`-delete_walfiles(oldest_lsn,oldest_tli,false);`
	`142`	`+delete_walfiles(oldest_lsn,oldest_tli,true);`
`143`	`143`
`144`	`144`	`return0;`
`145`	`145`	`}`
`@@ -349,10 +349,11 @@ delete_walfiles(XLogRecPtr oldest_lsn, TimeLineID oldest_tli, bool delete_all)`
`349`	`349`	`* they were originally written, in case this worries you.`
`350`	`350`	`*/`
`351`	`351`	`if (IsXLogFileName(arcde->d_name)\|\|`
`352`		`-IsPartialXLogFileName(arcde->d_name))`
	`352`	`+IsPartialXLogFileName(arcde->d_name)\|\|`
	`353`	`+IsBackupHistoryFileName(arcde->d_name))`
`353`	`354`	`{`
`354`	`355`	`if (XLogRecPtrIsInvalid(oldest_lsn)\|\|`
`355`		`-strcmp(arcde->d_name+8,oldestSegmentNeeded+8)<0)`
	`356`	`+strncmp(arcde->d_name+8,oldestSegmentNeeded+8,16)<0)`
`356`	`357`	`{`
`357`	`358`	`/*`
`358`	`359`	`* Use the original file name again now, including any`

Comments

(0)