Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit2fd0dda

Browse files
author
Viktoria Shepard
committed
Print remote host
1 parentdffc2b2 commit2fd0dda

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

‎src/restore.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ do_restore_or_validate(InstanceState *instanceState, time_t target_backup_id, pg
131131
boolcleanup_pgdata= false;
132132
boolbackup_has_tblspc= true;/* backup contain tablespace */
133133
XLogRecPtrshift_lsn=InvalidXLogRecPtr;
134+
chartimestamp[100];
134135

135136
if (instanceState==NULL)
136137
elog(ERROR,"Required parameter not specified: --instance");
@@ -687,6 +688,12 @@ do_restore_or_validate(InstanceState *instanceState, time_t target_backup_id, pg
687688
backup_id_of(dest_backup),
688689
dest_backup->server_version);
689690

691+
time2iso(timestamp,lengthof(timestamp),dest_backup->start_time, false);
692+
if (instance_config.remote.host)
693+
elog(INFO,"Restoring the database from the backup starting at %s on %s",timestamp,instance_config.remote.host);
694+
else
695+
elog(INFO,"Restoring the database from the backup starting at %s",timestamp);
696+
690697
restore_chain(dest_backup,parent_chain,dbOid_exclude_list,params,
691698
instance_config.pgdata,no_sync,cleanup_pgdata,backup_has_tblspc);
692699

@@ -720,7 +727,6 @@ restore_chain(pgBackup *dest_backup, parray *parent_chain,
720727
boolbackup_has_tblspc)
721728
{
722729
inti;
723-
chartimestamp[100];
724730
parray*pgdata_files=NULL;
725731
parray*dest_files=NULL;
726732
parray*external_dirs=NULL;
@@ -743,9 +749,6 @@ restore_chain(pgBackup *dest_backup, parray *parent_chain,
743749
time_tstart_time,end_time;
744750

745751
/* Preparations for actual restoring */
746-
time2iso(timestamp,lengthof(timestamp),dest_backup->start_time, false);
747-
elog(INFO,"Restoring the database from backup at %s",timestamp);
748-
749752
dest_files=get_backup_filelist(dest_backup, true);
750753

751754
/* Lock backup chain and make sanity checks */

‎tests/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
# git+https://github.com/postgrespro/testgres.git@<git-ref>
66
# 3. From a local directory
77
# /path/to/local/directory/testgres
8-
git+https://github.com/postgrespro/testgres.git@master#egg=testgres-pg_probackup2&subdirectory=testgres/plugins/pg_probackup2
8+
git+https://github.com/postgrespro/testgres.git@archive-command-exec#egg=testgres-pg_probackup2&subdirectory=testgres/plugins/pg_probackup2
99
allure-pytest
1010
deprecation
1111
pexpect
12-
pytest
12+
pytest==7.4.3
1313
pytest-xdist

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp