db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2026-06-21 01:34:15 +02:00
Code Issues Releases Activity

Make strict depend on backup-id for validate command.

Browse Source
This commit is contained in:
stalkerg
2016-11-25 12:52:40 +03:00
parent f63943a01e
commit 2eb6d92ee1
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
expected/option.out
+1 -1
View File
@@ -8,7 +8,7 @@ Usage:
pg_probackup [option...] backup
pg_probackup [option...] restore
pg_probackup [option...] show [backup-ID]
pg_probackup [option...] validate [backup-ID]
pg_probackup [option...] validate backup-ID
pg_probackup [option...] delete backup-ID
pg_probackup [option...] delwal [backup-ID]
expected/show.out
-2
View File
@@ -3,7 +3,6 @@
###### Status DONE and OK ######
0
NG: DONE status is not shown.
0
OK: OK status is shown properly.
###### SHOW COMMAND TEST-0002 ######
@@ -14,6 +13,5 @@ OK: RUNNING status is shown properly.
###### Status CORRUPT ######
0
remove a file from backup intentionally
0
NG: CORRUPT status is not shown.
pg_probackup.c
+5 -1
View File
@@ -202,7 +202,11 @@ main(int argc, char *argv[])
else if (pg_strcasecmp(cmd, "show") == 0)
return do_show(backup_id);
else if (pg_strcasecmp(cmd, "validate") == 0)
{
if (backup_id == 0)
elog(ERROR, "you must specify backup-ID for this command");
return do_validate(backup_id);
}
else if (pg_strcasecmp(cmd, "delete") == 0)
return do_delete(backup_id);
else if (pg_strcasecmp(cmd, "delwal") == 0)
@@ -222,7 +226,7 @@ pgut_help(bool details)
printf(_(" %s [option...] backup\n"), PROGRAM_NAME);
printf(_(" %s [option...] restore\n"), PROGRAM_NAME);
printf(_(" %s [option...] show [backup-ID]\n"), PROGRAM_NAME);
printf(_(" %s [option...] validate [backup-ID]\n"), PROGRAM_NAME);
printf(_(" %s [option...] validate backup-ID\n"), PROGRAM_NAME);
printf(_(" %s [option...] delete backup-ID\n"), PROGRAM_NAME);
printf(_(" %s [option...] delwal [backup-ID]\n"), PROGRAM_NAME);
sql/delete.sh
-4
View File
@@ -18,7 +18,6 @@ SECOND_BACKUP_DATE=$(get_time_last_backup)
pgbench -p ${TEST_PGPORT} >> ${TEST_BASE}/pgbench.log 2>&1
pg_probackup backup -B ${BACKUP_PATH} -b full -p ${TEST_PGPORT} -d postgres --quiet
THIRD_BACKUP_DATE=$(get_time_last_backup)
pg_probackup validate -B ${BACKUP_PATH} --quiet
echo "try to delete the oldest backup"
pg_probackup -B ${BACKUP_PATH} delete ${SECOND_BACKUP_DATE} > /dev/null 2>&1
@@ -37,14 +36,11 @@ FIRST_BACKUP_DATE=$(get_time_last_backup)
pgbench -p ${TEST_PGPORT} >> ${TEST_BASE}/pgbench.log 2>&1
pg_probackup backup -B ${BACKUP_PATH} -b full -p ${TEST_PGPORT} -d postgres --quiet
SECOND_BACKUP_DATE=$(get_time_last_backup)
pg_probackup validate -B ${BACKUP_PATH} --quiet
pgbench -p ${TEST_PGPORT} >> ${TEST_BASE}/pgbench.log 2>&1
pg_probackup backup -B ${BACKUP_PATH} -b page -p ${TEST_PGPORT} -d postgres --quiet
THIRD_BACKUP_DATE=$(get_time_last_backup)
pg_probackup validate -B ${BACKUP_PATH} --quiet
pg_probackup backup -B ${BACKUP_PATH} -b full -p ${TEST_PGPORT} -d postgres --quiet
FOURTH_BACKUP_DATE=$(get_time_last_backup)
pg_probackup validate -B ${BACKUP_PATH} --quiet
echo "try to delete before third backup"
pg_probackup delete -B ${BACKUP_PATH} ${THIRD_BACKUP_DATE} > /dev/null 2>&1
sql/show.sh
+2 -2
View File
@@ -18,7 +18,7 @@ if grep "DONE" ${TEST_BASE}/TEST-0001-show.out.1 > /dev/null ; then
else
echo 'NG: DONE status is not shown.'
fi
pg_probackup validate -B ${BACKUP_PATH} --quiet;echo $?
pg_probackup show -B ${BACKUP_PATH} > ${TEST_BASE}/TEST-0001-show.out.2 2>&1
if grep "OK" ${TEST_BASE}/TEST-0001-show.out.2 > /dev/null ; then
echo 'OK: OK status is shown properly.'
@@ -56,7 +56,7 @@ init_catalog
pg_probackup backup -B ${BACKUP_PATH} -b full -p ${TEST_PGPORT} -d postgres --quiet;echo $?
echo 'remove a file from backup intentionally'
rm -f `find ${BACKUP_PATH} -name postgresql.conf`
pg_probackup validate -B ${BACKUP_PATH} --quiet > /dev/null 2>&1;echo $?
pg_probackup show -B ${BACKUP_PATH} > ${TEST_BASE}/TEST-0003-show.out 2>&1
if grep "CORRUPT" ${TEST_BASE}/TEST-0003-show.out > /dev/null ; then
echo 'OK: CORRUPT status is shown properly.'