Fix remote delta backup

knizhnik · knizhnik · commit 3b144bbe2ba8 · 2019-01-18T00:21:42.000+03:00
diff --git a/src/backup.c b/src/backup.c
@@ -540,7 +540,7 @@ do_backup_instance(void)
 		pgBackupGetPath(prev_backup, prev_backup_filelist_path,
 						lengthof(prev_backup_filelist_path), DATABASE_FILE_LIST);
 		/* Files of previous backup needed by DELTA backup */
-		prev_backup_filelist = dir_read_file_list(NULL, prev_backup_filelist_path);
+		prev_backup_filelist = dir_read_file_list(NULL, prev_backup_filelist_path, FIO_BACKUP_HOST);
 
 		/* If lsn is not NULL, only pages with higher lsn will be copied. */
 		prev_backup_start_lsn = prev_backup->start_lsn;
diff --git a/src/dir.c b/src/dir.c
@@ -1404,13 +1404,13 @@ get_control_value(const char *str, const char *name,
  * If root is not NULL, path will be absolute path.
  */
 parray *
-dir_read_file_list(const char *root, const char *file_txt)
+dir_read_file_list(const char *root, const char *file_txt, fio_location location)
 {
 	FILE   *fp;
 	parray *files;
 	char	buf[MAXPGPATH * 2];
 
-	fp = fopen(file_txt, "rt");
+	fp = fio_open_stream(file_txt, location);
 	if (fp == NULL)
 		elog(ERROR, "cannot open \"%s\": %s", file_txt, strerror(errno));
 
@@ -1469,7 +1469,7 @@ dir_read_file_list(const char *root, const char *file_txt)
 		parray_append(files, file);
 	}
 
-	fclose(fp);
+	fio_close_stream(fp);
 	return files;
 }
 
diff --git a/src/merge.c b/src/merge.c
@@ -208,15 +208,15 @@ merge_backups(pgBackup *to_backup, pgBackup *from_backup)
 	 */
 	pgBackupGetPath(to_backup, control_file, lengthof(control_file),
 					DATABASE_FILE_LIST);
-	to_files = dir_read_file_list(NULL, control_file);
+	to_files = dir_read_file_list(NULL, control_file, FIO_BACKUP_HOST);
 	/* To delete from leaf, sort in reversed order */
 	parray_qsort(to_files, pgFileComparePathDesc);
 	/*
 	 * Get list of files which need to be moved.
 	 */
 	pgBackupGetPath(from_backup, control_file, lengthof(control_file),
 					DATABASE_FILE_LIST);
-	files = dir_read_file_list(NULL, control_file);
+	files = dir_read_file_list(NULL, control_file, FIO_BACKUP_HOST);
 	/* sort by size for load balancing */
 	parray_qsort(files, pgFileCompareSize);
 
diff --git a/src/pg_probackup.h b/src/pg_probackup.h
@@ -520,7 +520,7 @@ extern void opt_tablespace_map(ConfigOption *opt, const char *arg);
 extern void check_tablespace_mapping(pgBackup *backup);
 
 extern void print_file_list(FILE *out, const parray *files, const char *root);
-extern parray *dir_read_file_list(const char *root, const char *file_txt);
+extern parray *dir_read_file_list(const char *root, const char *file_txt, fio_location location);
 
 extern int dir_create_dir(const char *path, mode_t mode);
 extern bool dir_is_empty(const char *path);
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);
+	files = dir_read_file_list(database_path, list_path, FIO_DB_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);
+	files = dir_read_file_list(instance_config.pgdata, filelist_path, FIO_DB_HOST);
 	parray_qsort(files, pgFileComparePathDesc);
 
 	/* Get list of files actually existing in target database */
diff --git a/src/validate.c b/src/validate.c
@@ -90,7 +90,7 @@ pgBackupValidate(pgBackup *backup)
 
 	pgBackupGetPath(backup, base_path, lengthof(base_path), DATABASE_DIR);
 	pgBackupGetPath(backup, path, lengthof(path), DATABASE_FILE_LIST);
-	files = dir_read_file_list(base_path, path);
+	files = dir_read_file_list(base_path, path, FIO_BACKUP_HOST);
 
 	/* setup threads */
 	for (i = 0; i < parray_num(files); i++)
