Commit2eb6d92

committed

Make strict depend on backup-id for validate command.

1 parentf63943a commit2eb6d92Copy full SHA for 2eb6d92

File tree

-10

lines changed

-10

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ Usage:`
`8`	`8`	`pg_probackup [option...] backup`
`9`	`9`	`pg_probackup [option...] restore`
`10`	`10`	`pg_probackup [option...] show [backup-ID]`
`11`		`- pg_probackup [option...] validate[backup-ID]`
	`11`	`+ pg_probackup [option...] validate backup-ID`
`12`	`12`	`pg_probackup [option...] delete backup-ID`
`13`	`13`	`pg_probackup [option...] delwal [backup-ID]`
`14`	`14`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`###### Status DONE and OK ######`
`4`	`4`	`0`
`5`	`5`	`NG: DONE status is not shown.`
`6`		`-0`
`7`	`6`	`OK: OK status is shown properly.`
`8`	`7`
`9`	`8`	`###### SHOW COMMAND TEST-0002 ######`
`@@ -14,6 +13,5 @@ OK: RUNNING status is shown properly.`
`14`	`13`	`###### Status CORRUPT ######`
`15`	`14`	`0`
`16`	`15`	`remove a file from backup intentionally`
`17`		`-0`
`18`	`16`	`NG: CORRUPT status is not shown.`
`19`	`17`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,11 @@ main(int argc, char *argv[])`
`202`	`202`	`elseif (pg_strcasecmp(cmd,"show")==0)`
`203`	`203`	`returndo_show(backup_id);`
`204`	`204`	`elseif (pg_strcasecmp(cmd,"validate")==0)`
	`205`	`+{`
	`206`	`+if (backup_id==0)`
	`207`	`+elog(ERROR,"you must specify backup-ID for this command");`
`205`	`208`	`returndo_validate(backup_id);`
	`209`	`+}`
`206`	`210`	`elseif (pg_strcasecmp(cmd,"delete")==0)`
`207`	`211`	`returndo_delete(backup_id);`
`208`	`212`	`elseif (pg_strcasecmp(cmd,"delwal")==0)`
`@@ -222,7 +226,7 @@ pgut_help(bool details)`
`222`	`226`	`printf(_(" %s [option...] backup\n"),PROGRAM_NAME);`
`223`	`227`	`printf(_(" %s [option...] restore\n"),PROGRAM_NAME);`
`224`	`228`	`printf(_(" %s [option...] show [backup-ID]\n"),PROGRAM_NAME);`
`225`		`-printf(_(" %s [option...] validate[backup-ID]\n"),PROGRAM_NAME);`
	`229`	`+printf(_(" %s [option...] validate backup-ID\n"),PROGRAM_NAME);`
`226`	`230`	`printf(_(" %s [option...] delete backup-ID\n"),PROGRAM_NAME);`
`227`	`231`	`printf(_(" %s [option...] delwal [backup-ID]\n"),PROGRAM_NAME);`
`228`	`232`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ SECOND_BACKUP_DATE=$(get_time_last_backup)`
`18`	`18`	`pgbench -p${TEST_PGPORT}>>${TEST_BASE}/pgbench.log2>&1`
`19`	`19`	`pg_probackup backup -B${BACKUP_PATH} -b full -p${TEST_PGPORT} -d postgres --quiet`
`20`	`20`	`THIRD_BACKUP_DATE=$(get_time_last_backup)`
`21`		`-pg_probackup validate -B${BACKUP_PATH} --quiet`
`22`	`21`
`23`	`22`	`echo"try to delete the oldest backup"`
`24`	`23`	`pg_probackup -B${BACKUP_PATH} delete${SECOND_BACKUP_DATE}> /dev/null2>&1`
`@@ -37,14 +36,11 @@ FIRST_BACKUP_DATE=$(get_time_last_backup)`
`37`	`36`	`pgbench -p${TEST_PGPORT}>>${TEST_BASE}/pgbench.log2>&1`
`38`	`37`	`pg_probackup backup -B${BACKUP_PATH} -b full -p${TEST_PGPORT} -d postgres --quiet`
`39`	`38`	`SECOND_BACKUP_DATE=$(get_time_last_backup)`
`40`		`-pg_probackup validate -B${BACKUP_PATH} --quiet`
`41`	`39`	`pgbench -p${TEST_PGPORT}>>${TEST_BASE}/pgbench.log2>&1`
`42`	`40`	`pg_probackup backup -B${BACKUP_PATH} -b page -p${TEST_PGPORT} -d postgres --quiet`
`43`	`41`	`THIRD_BACKUP_DATE=$(get_time_last_backup)`
`44`		`-pg_probackup validate -B${BACKUP_PATH} --quiet`
`45`	`42`	`pg_probackup backup -B${BACKUP_PATH} -b full -p${TEST_PGPORT} -d postgres --quiet`
`46`	`43`	`FOURTH_BACKUP_DATE=$(get_time_last_backup)`
`47`		`-pg_probackup validate -B${BACKUP_PATH} --quiet`
`48`	`44`
`49`	`45`	`echo"try to delete before third backup"`
`50`	`46`	`pg_probackup delete -B${BACKUP_PATH}${THIRD_BACKUP_DATE}> /dev/null2>&1`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ if grep "DONE" ${TEST_BASE}/TEST-0001-show.out.1 > /dev/null ; then`
`18`	`18`	`else`
`19`	`19`	`echo'NG: DONE status is not shown.'`
`20`	`20`	`fi`
`21`		`-pg_probackup validate -B${BACKUP_PATH} --quiet;echo$?`
	`21`	`+`
`22`	`22`	`pg_probackup show -B${BACKUP_PATH}>${TEST_BASE}/TEST-0001-show.out.22>&1`
`23`	`23`	`if grep"OK"${TEST_BASE}/TEST-0001-show.out.2> /dev/null;then`
`24`	`24`	`echo'OK: OK status is shown properly.'`
`@@ -56,7 +56,7 @@ init_catalog`
`56`	`56`	`pg_probackup backup -B${BACKUP_PATH} -b full -p${TEST_PGPORT} -d postgres --quiet;echo$?`
`57`	`57`	`echo'remove a file from backup intentionally'`
`58`	`58`	rm -f`find${BACKUP_PATH} -name postgresql.conf`
`59`		`-pg_probackup validate -B${BACKUP_PATH} --quiet> /dev/null2>&1;echo$?`
	`59`	`+`
`60`	`60`	`pg_probackup show -B${BACKUP_PATH}>${TEST_BASE}/TEST-0003-show.out2>&1`
`61`	`61`	`if grep"CORRUPT"${TEST_BASE}/TEST-0003-show.out> /dev/null;then`
`62`	`62`	`echo'OK: CORRUPT status is shown properly.'`

Comments

(0)