fix external dir path, introduced by 286d30d

Author: gsmolk

src/backup.c

@@ -283,7 +283,7 @@ do_backup_instance(PGconn *backup_conn, PGNodeInfo *nodeInfo, bool no_sync, bool
 
 	/* initialize backup's file list */
 	backup_files_list = parray_new();
-	join_path_components(external_prefix, current.database_dir, EXTERNAL_DIR);
+	join_path_components(external_prefix, current.root_dir, EXTERNAL_DIR);
 
 	/* list files with the logical path. omit $PGDATA */
 	if (fio_is_remote(FIO_DB_HOST))
@@ -738,6 +738,11 @@ do_backup(pgSetBackupParams *set_backup_params,
 	/* Initialize PGInfonode */
 	pgNodeInit(&nodeInfo);
 
+	/* Save list of external directories */
+	if (instance_config.external_dir_str &&
+		(pg_strcasecmp(instance_config.external_dir_str, "none") != 0))
+		current.external_dir_str = instance_config.external_dir_str;
+
 	/* Create backup directory and BACKUP_CONTROL_FILE */
 	pgBackupCreateDir(&current, backup_instance_path);
 
@@ -755,11 +760,6 @@ do_backup(pgSetBackupParams *set_backup_params,
 	current.compress_alg = instance_config.compress_alg;
 	current.compress_level = instance_config.compress_level;
 
-	/* Save list of external directories */
-	if (instance_config.external_dir_str &&
-		(pg_strcasecmp(instance_config.external_dir_str, "none") != 0))
-		current.external_dir_str = instance_config.external_dir_str;
-
 	elog(INFO, "Backup start, pg_probackup version: %s, instance: %s, backup ID: %s, backup mode: %s, "
 			"wal mode: %s, remote: %s, compress-algorithm: %s, compress-level: %i",
 			PROGRAM_VERSION, instance_name, base36enc(current.backup_id), pgBackupGetBackupMode(&current),

src/utils/file.c

@@ -1026,7 +1026,9 @@ int fio_unlink(char const* path, fio_location location)
 	}
 }
 
-/* Create directory */
+/* Create directory
+ * TODO: add strict flag
+ */
 int fio_mkdir(char const* path, int mode, fio_location location)
 {
 	if (fio_is_remote(location))

src/validate.c

@@ -48,7 +48,6 @@ typedef struct
 void
 pgBackupValidate(pgBackup *backup, pgRestoreParams *params)
 {
-	char		base_path[MAXPGPATH];
 	char		external_prefix[MAXPGPATH];
 	parray	   *files = NULL;
 	bool		corrupted = false;
@@ -115,7 +114,6 @@ pgBackupValidate(pgBackup *backup, pgRestoreParams *params)
 		backup->backup_mode != BACKUP_MODE_DIFF_DELTA)
 		elog(WARNING, "Invalid backup_mode of backup %s", base36enc(backup->start_time));
 
-	join_path_components(base_path, backup->root_dir, DATABASE_DIR);
 	join_path_components(external_prefix, backup->root_dir, EXTERNAL_DIR);
 	files = get_backup_filelist(backup, false);
 
@@ -149,7 +147,7 @@ pgBackupValidate(pgBackup *backup, pgRestoreParams *params)
 	{
 		validate_files_arg *arg = &(threads_args[i]);
 
-		arg->base_path = base_path;
+		arg->base_path = backup->database_dir;
 		arg->files = files;
 		arg->corrupted = false;
 		arg->backup_mode = backup->backup_mode;