[Issue #132] new flag "--force" for "restore" command allows to ignore invalid backup status during restore

Author: gsmolk

src/help.c

@@ -151,7 +151,7 @@ help_pg_probackup(void)
 	printf(_("                 [--recovery-target=immediate|latest]\n"));
 	printf(_("                 [--recovery-target-name=target-name]\n"));
 	printf(_("                 [--recovery-target-action=pause|promote|shutdown]\n"));
-	printf(_("                 [--restore-as-replica]\n"));
+	printf(_("                 [--restore-as-replica] [--force]\n"));
 	printf(_("                 [--no-validate] [--skip-block-validation]\n"));
 	printf(_("                 [-T OLDDIR=NEWDIR] [--progress]\n"));
 	printf(_("                 [--external-mapping=OLDDIR=NEWDIR]\n"));
@@ -384,7 +384,7 @@ help_restore(void)
 	printf(_("                 [--recovery-target=immediate|latest]\n"));
 	printf(_("                 [--recovery-target-name=target-name]\n"));
 	printf(_("                 [--recovery-target-action=pause|promote|shutdown]\n"));
-	printf(_("                 [--restore-as-replica]\n"));
+	printf(_("                 [--restore-as-replica] [--force]\n"));
 	printf(_("                 [--no-validate] [--skip-block-validation]\n"));
 	printf(_("                 [-T OLDDIR=NEWDIR] [--progress]\n"));
 	printf(_("                 [--external-mapping=OLDDIR=NEWDIR]\n"));
@@ -422,6 +422,7 @@ help_restore(void)
 
 	printf(_("  -R, --restore-as-replica         write a minimal recovery.conf in the output directory\n"));
 	printf(_("                                   to ease setting up a standby server\n"));
+	printf(_("      --force                      ignore invalid status of the restored backup\n"));
 	printf(_("      --no-validate                disable backup validation during restore\n"));
 	printf(_("      --skip-block-validation      set to validate only file-level checksum\n"));
 

src/pg_probackup.c

@@ -111,7 +111,7 @@ bool amcheck_parent = false;
 bool		delete_wal = false;
 bool		delete_expired = false;
 bool		merge_expired = false;
-bool		force_delete = false;
+bool		force = false;
 bool		dry_run = false;
 
 /* compression options */
@@ -196,7 +196,7 @@ static ConfigOption cmd_options[] =
 	{ 'b', 145, "wal",				&delete_wal,		SOURCE_CMD_STRICT },
 	{ 'b', 146, "expired",			&delete_expired,	SOURCE_CMD_STRICT },
 	/* TODO not implemented yet */
-	{ 'b', 147, "force",			&force_delete,		SOURCE_CMD_STRICT },
+	{ 'b', 147, "force",			&force,				SOURCE_CMD_STRICT },
 	/* compression options */
 	{ 'b', 148, "compress",			&compress_shortcut,	SOURCE_CMD_STRICT },
 	/* connection options */
@@ -646,9 +646,17 @@ main(int argc, char *argv[])
 					(target_immediate) ? "immediate" : NULL,
 				target_name, target_action);
 
+		if (force && backup_subcmd != RESTORE_CMD)
+			elog(ERROR, "You cannot specify \"--force\" flag with the \"%s\" command",
+				command_name);
+
+		if (force)
+			no_validate = true;
+
 		/* keep all params in one structure */
 		restore_params = pgut_new(pgRestoreParams);
 		restore_params->is_restore = (backup_subcmd == RESTORE_CMD);
+		restore_params->force = force;
 		restore_params->no_validate = no_validate;
 		restore_params->restore_as_replica = restore_as_replica;
 		restore_params->skip_block_validation = skip_block_validation;

src/pg_probackup.h

@@ -380,11 +380,12 @@ typedef struct pgRecoveryTarget
 /* Options needed for restore and validate commands */
 typedef struct pgRestoreParams
 {
+	bool	force;
 	bool	is_restore;
 	bool	no_validate;
 	bool	restore_as_replica;
 	bool	skip_external_dirs;
-	bool	skip_block_validation;
+	bool	skip_block_validation; //Start using it
 	const char *restore_command;
 
 	/* options for partial restore */
@@ -565,7 +566,6 @@ extern bool exclusive_backup;
 extern bool		delete_wal;
 extern bool		delete_expired;
 extern bool		merge_expired;
-extern bool		force_delete;
 extern bool		dry_run;
 
 /* compression options */

src/restore.c

@@ -181,7 +181,7 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
 				if ((current_backup->status == BACKUP_STATUS_ORPHAN ||
 					current_backup->status == BACKUP_STATUS_CORRUPT ||
 					current_backup->status == BACKUP_STATUS_RUNNING)
-					&& !params->no_validate)
+					&& (!params->no_validate || params->force))
 					elog(WARNING, "Backup %s has status: %s",
 						 base36enc(current_backup->start_time), status2str(current_backup->status));
 				else
@@ -421,9 +421,19 @@ do_restore_or_validate(time_t target_backup_id, pgRecoveryTarget *rt,
 			elog(INFO, "Backup %s is valid.", base36enc(dest_backup->start_time));
 	}
 	else if (dest_backup->status == BACKUP_STATUS_CORRUPT)
-		elog(ERROR, "Backup %s is corrupt.", base36enc(dest_backup->start_time));
+	{
+		if (params->force)
+			elog(WARNING, "Backup %s is corrupt.", base36enc(dest_backup->start_time));
+		else
+			elog(ERROR, "Backup %s is corrupt.", base36enc(dest_backup->start_time));
+	}
 	else if (dest_backup->status == BACKUP_STATUS_ORPHAN)
-		elog(ERROR, "Backup %s is orphan.", base36enc(dest_backup->start_time));
+	{
+		if (params->force)
+			elog(WARNING, "Backup %s is orphan.", base36enc(dest_backup->start_time));
+		else
+			elog(ERROR, "Backup %s is orphan.", base36enc(dest_backup->start_time));
+	}
 	else
 		elog(ERROR, "Backup %s has status: %s",
 				base36enc(dest_backup->start_time), status2str(dest_backup->status));
@@ -552,8 +562,14 @@ restore_backup(pgBackup *backup, parray *dest_external_dirs,
 
 	if (backup->status != BACKUP_STATUS_OK &&
 		backup->status != BACKUP_STATUS_DONE)
-		elog(ERROR, "Backup %s cannot be restored because it is not valid",
-			 base36enc(backup->start_time));
+	{
+		if (params->force)
+			elog(WARNING, "Backup %s is not valid, restore is forced",
+				 base36enc(backup->start_time));
+		else
+			elog(ERROR, "Backup %s cannot be restored because it is not valid",
+				 base36enc(backup->start_time));
+	}
 
 	/* confirm block size compatibility */
 	if (backup->block_size != BLCKSZ)