db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-04-02 23:25:32 +02:00
Code Issues Releases Activity

Small fix restore logic.

Browse Source
This commit is contained in:
stalkerg 2016-11-08 15:53:45 +03:00
parent 78362a52d6
commit ed3e7a5551
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pg_arman.c
View File

@ -176,6 +176,9 @@ main(int argc, char *argv[])
if(!backup_logs) if(!backup_logs)
pgdata_exclude[i++] = "pg_log"; 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 */ /* do actual operation */
if (pg_strcasecmp(cmd, "init") == 0) if (pg_strcasecmp(cmd, "init") == 0)
return do_init(); return do_init();

9
restore.c
View File

@ -161,6 +161,8 @@ base_backup_found:
print_backup_lsn(base_backup); print_backup_lsn(base_backup);
stream_wal = base_backup->stream;
/* restore base backup */ /* restore base backup */
restore_database(base_backup); restore_database(base_backup);
@ -181,6 +183,9 @@ base_backup_found:
if (backup->backup_mode == BACKUP_MODE_FULL) if (backup->backup_mode == BACKUP_MODE_FULL)
break; break;
if (backup_id && backup->start_time > backup_id)
break;
/* use database backup only */ /* use database backup only */
if (backup->backup_mode != BACKUP_MODE_DIFF_PAGE && if (backup->backup_mode != BACKUP_MODE_DIFF_PAGE &&
backup->backup_mode != BACKUP_MODE_DIFF_PTRACK) backup->backup_mode != BACKUP_MODE_DIFF_PTRACK)
@ -198,7 +203,7 @@ base_backup_found:
last_restored_index = i; last_restored_index = i;
} }
if (!stream_wal) if (!stream_wal || target_time != NULL || target_xid != NULL)
for (i = last_restored_index; i >= 0; i--) for (i = last_restored_index; i >= 0; i--)
{ {
elog(LOG, "searching archived WAL..."); elog(LOG, "searching archived WAL...");
@ -209,7 +214,7 @@ base_backup_found:
} }
/* create recovery.conf */ /* 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); create_recovery_conf(target_time, target_xid, target_inclusive, target_tli);
/* release catalog lock */ /* release catalog lock */