Fix remote restore from backup

knizhnik · knizhnik · commit f8e9af6930b2 · 2019-01-22T18:45:39.000+03:00
diff --git a/src/pg_probackup.c b/src/pg_probackup.c
@@ -167,7 +167,7 @@ static ConfigOption cmd_options[] =
 	/* show options */
 	{ 'f', 153, "format",			opt_show_format,	SOURCE_CMD_STRICT },
 	/* remote options */
-	{ 's', 155, "agent",			&remote_agent,      SOURCE_CMD_STRICT, },
+	{ 's', 155, "agent",			&remote_agent,      SOURCE_CMD_STRICT },
 	{ 0 }
 };
 
diff --git a/src/restore.c b/src/restore.c
@@ -457,7 +457,7 @@ restore_backup(pgBackup *backup)
 	 */
 	pgBackupGetPath(backup, database_path, lengthof(database_path), DATABASE_DIR);
 	pgBackupGetPath(backup, list_path, lengthof(list_path), DATABASE_FILE_LIST);
-	files = dir_read_file_list(database_path, list_path, FIO_DB_HOST);
+	files = dir_read_file_list(database_path, list_path, FIO_BACKUP_HOST);
 
 	threads = (pthread_t *) palloc(sizeof(pthread_t) * num_threads);
 	threads_args = (restore_files_arg *) palloc(sizeof(restore_files_arg)*num_threads);
@@ -523,7 +523,7 @@ remove_deleted_files(pgBackup *backup)
 
 	pgBackupGetPath(backup, filelist_path, lengthof(filelist_path), DATABASE_FILE_LIST);
 	/* Read backup's filelist using target database path as base path */
-	files = dir_read_file_list(instance_config.pgdata, filelist_path, FIO_DB_HOST);
+	files = dir_read_file_list(instance_config.pgdata, filelist_path, FIO_BACKUP_HOST);
 	parray_qsort(files, pgFileComparePathDesc);
 
 	/* Get list of files actually existing in target database */
