Small fix restore logic.

stalkerg · stalkerg · commit ed3e7a555129 · 2016-11-08T15:53:45.000+03:00
diff --git a/pg_arman.c b/pg_arman.c
@@ -176,6 +176,9 @@ main(int argc, char *argv[])
 	if(!backup_logs)
 		pgdata_exclude[i++] = "pg_log";
 
+	if (target_time != NULL && target_xid != NULL)
+		elog(ERROR, "You can't specify recovery-target-time and recovery-target-xid at the same time");
+
 	/* do actual operation */
 	if (pg_strcasecmp(cmd, "init") == 0)
 		return do_init();
diff --git a/restore.c b/restore.c
@@ -161,6 +161,8 @@ do_restore(time_t backup_id,
 
 	print_backup_lsn(base_backup);
 
+	stream_wal = base_backup->stream;
+
 	/* restore base backup */
 	restore_database(base_backup);
 
@@ -181,6 +183,9 @@ do_restore(time_t backup_id,
 		if (backup->backup_mode == BACKUP_MODE_FULL)
 			break;
 
+		if (backup_id && backup->start_time > backup_id)
+			break;
+
 		/* use database backup only */
 		if (backup->backup_mode != BACKUP_MODE_DIFF_PAGE &&
 			backup->backup_mode != BACKUP_MODE_DIFF_PTRACK)
@@ -198,7 +203,7 @@ do_restore(time_t backup_id,
 		last_restored_index = i;
 	}
 
-	if (!stream_wal)
+	if (!stream_wal || target_time != NULL || target_xid != NULL)
 		for (i = last_restored_index; i >= 0; i--)
 		{
 			elog(LOG, "searching archived WAL...");
@@ -209,7 +214,7 @@ do_restore(time_t backup_id,
 		}
 
 	/* create recovery.conf */
-	if (!stream_wal)
+	if (!stream_wal || target_time != NULL || target_xid != NULL)
 		create_recovery_conf(target_time, target_xid, target_inclusive, target_tli);
 
 	/* release catalog lock */
