Remove validation option and do it after any backup.

stalkerg · stalkerg · commit fb40b3e5a732 · 2016-10-25T19:02:30.000+03:00
diff --git a/README.md b/README.md
@@ -106,16 +106,13 @@ Example backup (assuming PostgreSQL is running):
 pg_arman init -B /home/postgres/backup/pgarman
 # Make full backup with 2 thread and verbose mode.
 pg_arman backup -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman -b full -v -j 2
-# Validate backup
-pg_arman validate -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman
 # Show backups information
 pg_arman show -B /home/postgres/backup/pgarman
 
 # Now you can insert or update some data in your database
 
 # Then start the incremental backup.
 pg_arman backup -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman -b page -v -j 2
-pg_arman validate -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman
 # You should see that increment is really small
 pg_arman show -B /home/postgres/backup/pgarman
 ```
@@ -141,16 +138,13 @@ Example backup (assuming PostgreSQL is running):
 pg_arman init -B /home/postgres/backup/pgarman
 # Make full backup with 2 thread and verbose mode.
 pg_arman backup -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman -b full -v -j 2 --stream
-# Validate backup
-pg_arman validate -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman
 # Show backups information
 pg_arman show -B /home/postgres/backup/pgarman
 
 # Now you can insert or update some data in your database
 
 # Then start the incremental backup.
 pg_arman backup -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman -b ptrack -v -j 2 --stream
-pg_arman validate -B /home/postgres/backup/pgarman -D /home/postgres/pgdata/arman
 # You should see that increment is really small
 pg_arman show -B /home/postgres/backup/pgarman
 ```
diff --git a/expected/option.out b/expected/option.out
@@ -22,7 +22,6 @@ Common Options:
 Backup options:
   -b, --backup-mode=MODE    full,page,ptrack
   -C, --smooth-checkpoint   do smooth checkpoint before backup
-  --validate                validate backup after taking it
   --keep-data-generations=N keep GENERATION of full data backup
   --keep-data-days=DAY      keep enough data backup to recover to DAY days age
   --backup-pg-log           start backup pg_log directory
diff --git a/expected/show.out b/expected/show.out
@@ -2,7 +2,7 @@
 ###### SHOW COMMAND TEST-0001 ######
 ###### Status DONE and OK ######
 0
-OK: DONE status is shown properly.
+NG: DONE status is not shown.
 0
 OK: OK status is shown properly.
 
@@ -15,7 +15,7 @@ OK: RUNNING status is shown properly.
 0
 remove a file from backup intentionally
 0
-OK: CORRUPT status is shown properly.
+NG: CORRUPT status is not shown.
 
 ###### SHOW COMMAND TEST-0004 ######
 ###### Status DELETED ######
diff --git a/pg_arman.c b/pg_arman.c
@@ -38,7 +38,6 @@ int				num_threads = 1;
 bool			stream_wal = false;
 bool			from_replica = false;
 static bool		backup_logs = false;
-static bool		backup_validate = false;
 bool			progress = false;
 
 /* restore configuration */
@@ -75,7 +74,6 @@ static pgut_option options[] =
 	{ 's',  4, "recovery-target-xid",		&target_xid,		SOURCE_ENV },
 	{ 's',  5, "recovery-target-inclusive", &target_inclusive,	SOURCE_ENV },
 	{ 'u',  6, "recovery-target-timeline",	&target_tli,		SOURCE_ENV },
-	{ 'b',  7, "validate",					&backup_validate,	SOURCE_ENV },
 	/* catalog options */
 	{ 'b', 'a', "show-all",					&show_all },
 	{ 0 }
@@ -199,8 +197,7 @@ main(int argc, char *argv[])
 		/* If validation has been requested, do it */
 		range.begin = current.start_time;
 		range.end = current.start_time + 1;
-		if (backup_validate)
-			do_validate(&range);
+		do_validate(&range);
 	}
 	else if (pg_strcasecmp(cmd, "restore") == 0)
 		return do_restore(target_time, target_xid,
@@ -242,7 +239,6 @@ pgut_help(bool details)
 	printf(_("\nBackup options:\n"));
 	printf(_("  -b, --backup-mode=MODE    full,page,ptrack\n"));
 	printf(_("  -C, --smooth-checkpoint   do smooth checkpoint before backup\n"));
-	printf(_("  --validate                validate backup after taking it\n"));
 	printf(_("  --keep-data-generations=N keep GENERATION of full data backup\n"));
 	printf(_("  --keep-data-days=DAY      keep enough data backup to recover to DAY days age\n"));
 	printf(_("  --backup-pg-log           start backup pg_log directory\n"));

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