Print remote host

Viktoria Shepard · Viktoria Shepard · commit 2fd0dda48852 · 2024-03-07T23:28:44.000+03:00
diff --git a/src/restore.c b/src/restore.c
@@ -131,6 +131,7 @@ do_restore_or_validate(InstanceState *instanceState, time_t target_backup_id, pg
 	bool        cleanup_pgdata = false;
 	bool        backup_has_tblspc = true; /* backup contain tablespace */
 	XLogRecPtr  shift_lsn = InvalidXLogRecPtr;
+	char		timestamp[100];
 
 	if (instanceState == NULL)
 		elog(ERROR, "Required parameter not specified: --instance");
@@ -687,6 +688,12 @@ do_restore_or_validate(InstanceState *instanceState, time_t target_backup_id, pg
 					 backup_id_of(dest_backup),
 					 dest_backup->server_version);
 
+		time2iso(timestamp, lengthof(timestamp), dest_backup->start_time, false);
+		if (instance_config.remote.host)
+			elog(INFO, "Restoring the database from the backup starting at %s on %s", timestamp, instance_config.remote.host);
+		else
+			elog(INFO, "Restoring the database from the backup starting at %s", timestamp);
+
 		restore_chain(dest_backup, parent_chain, dbOid_exclude_list, params,
 					  instance_config.pgdata, no_sync, cleanup_pgdata, backup_has_tblspc);
 
@@ -720,7 +727,6 @@ restore_chain(pgBackup *dest_backup, parray *parent_chain,
 			  bool backup_has_tblspc)
 {
 	int			i;
-	char		timestamp[100];
 	parray      *pgdata_files = NULL;
 	parray		*dest_files = NULL;
 	parray		*external_dirs = NULL;
@@ -743,9 +749,6 @@ restore_chain(pgBackup *dest_backup, parray *parent_chain,
 	time_t		start_time, end_time;
 
 	/* Preparations for actual restoring */
-	time2iso(timestamp, lengthof(timestamp), dest_backup->start_time, false);
-	elog(INFO, "Restoring the database from backup at %s", timestamp);
-
 	dest_files = get_backup_filelist(dest_backup, true);
 
 	/* Lock backup chain and make sanity checks */
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -5,9 +5,9 @@
 #    git+https://github.com/postgrespro/testgres.git@<git-ref>
 # 3. From a local directory
 #    /path/to/local/directory/testgres
-git+https://github.com/postgrespro/testgres.git@master#egg=testgres-pg_probackup2&subdirectory=testgres/plugins/pg_probackup2
+git+https://github.com/postgrespro/testgres.git@archive-command-exec#egg=testgres-pg_probackup2&subdirectory=testgres/plugins/pg_probackup2
 allure-pytest
 deprecation
 pexpect
-pytest
+pytest==7.4.3
 pytest-xdist
