Commitccd4f48

committed

Fix check ptrack control file.

1 parent075c37b commitccd4f48Copy full SHA for ccd4f48

File tree

+13

-8

lines changed

+13

-8

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ do_backup_database(parray *backup_list, pgBackupOption bkupopt)`
`238`	`238`	`if (current.backup_mode==BACKUP_MODE_DIFF_PTRACK)`
`239`	`239`	`{`
`240`	`240`	`XLogRecPtrptrack_lsn=get_last_ptrack_lsn();`
`241`		`-if (ptrack_lsn<prev_backup->start_lsn\|\|ptrack_lsn >=current.start_lsn)`
	`241`	`+if (ptrack_lsn>prev_backup->stop_lsn)`
`242`	`242`	`elog(ERROR,"Wrong ptrack lsn:%lx prev:%lx current:%lx",`
`243`	`243`	`ptrack_lsn,`
`244`	`244`	`prev_backup->start_lsn,`

Lines changed: 11 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,25 +32,30 @@ OK: recovery-target-xid options works well.`
`32`	`32`	`###### RESTORE COMMAND TEST-0006 ######`
`33`	`33`	`###### recovery to latest from full + ptrack backups ######`
`34`	`34`	`0`
`35`		`-1`
	`35`	`+0`
`36`	`36`	`0`
`37`	`37`
`38`	`38`	`###### RESTORE COMMAND TEST-0007 ######`
`39`	`39`	`###### recovery to latest from full + ptrack + ptrack backups ######`
`40`	`40`	`0`
`41`		`-1`
`42`		`-1`
	`41`	`+0`
	`42`	`+0`
`43`	`43`	`0`
`44`	`44`
`45`	`45`	`###### RESTORE COMMAND TEST-0010 ######`
`46`		`-###### recovery to latest from full + page backups with loads when full backup do ######`
	`46`	`+###### recovery to latest from full + page backups with loads when ptrack backup do ######`
	`47`	`+0`
`47`	`48`	`0`
`48`		`-1`
`49`	`49`	`0`
`50`	`50`
`51`	`51`	`###### RESTORE COMMAND TEST-0009 ######`
`52`	`52`	`###### recovery to latest from full + ptrack backups with loads when full backup do ######`
`53`	`53`	`0`
`54`		`-1`
	`54`	`+0`
`55`	`55`	`0`
`56`	`56`
	`57`	`+###### RESTORE COMMAND TEST-0008 ######`
	`58`	`+###### recovery with target inclusive false ######`
	`59`	`+0`
	`60`	`+0`
	`61`	`+OK: recovery-target-inclusive=false works well.`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ echo '###### ptrack backup mode ######'`
`79`	`79`	`init_catalog`
`80`	`80`	`pg_arman backup -B${BACKUP_PATH} -b full -p${TEST_PGPORT} -d postgres --verbose>${TEST_BASE}/TEST-0006-run.log2>&1;echo$?`
`81`	`81`	`pg_arman validate -B${BACKUP_PATH} --verbose>>${TEST_BASE}/TEST-0006-run.log2>&1`
`82`		`-pg_arman backup -B${BACKUP_PATH} -b ptrack -p${TEST_PGPORT} -d postgres --verbose>${TEST_BASE}/TEST-0006-run.log2>&1;echo$?`
	`82`	`+pg_arman backup -B${BACKUP_PATH} -b ptrack -p${TEST_PGPORT} -d postgres --verbose>>${TEST_BASE}/TEST-0006-run.log2>&1;echo$?`
`83`	`83`	`pg_arman validate -B${BACKUP_PATH}>>${TEST_BASE}/TEST-0006-run.log2>&1`
`84`	`84`	`pg_arman show -B${BACKUP_PATH}>${TEST_BASE}/TEST-0006.log2>&1`
`85`	`85`	`grep -c OK${TEST_BASE}/TEST-0006.log`

Comments

(0)