Code cleanup. Pass backup_catalog_path explicitly to functions that need it

Author: alubennikova

src/archive.c

@@ -1046,7 +1046,7 @@ do_archive_get(InstanceConfig *instance, const char *prefetch_dir_arg,
 	join_path_components(absolute_wal_file_path, current_dir, wal_file_path);
 
 	/* full filepath to WAL file in archive directory.
-	 * backup_path/wal/instance_name/000000010000000000000001 */
+	 * $BACKUP_PATH/wal/instance_name/000000010000000000000001 */
 	join_path_components(backup_wal_file_path, instance->arclog_path, wal_file_name);
 
 	INSTR_TIME_SET_CURRENT(start_time);

src/backup.c

@@ -89,7 +89,7 @@ backup_stopbackup_callback(bool fatal, void *userdata)
 
 /*
  * Take a backup of a single postgresql instance.
- * Move files from 'pgdata' to a subdirectory in 'backup_path'.
+ * Move files from 'pgdata' to a subdirectory in backup catalog.
  */
 static void
 do_backup_instance(PGconn *backup_conn, PGNodeInfo *nodeInfo, bool no_sync, bool backup_logs)

src/catalog.c

@@ -692,7 +692,7 @@ IsDir(const char *dirpath, const char *entry, fio_location location)
  * actual config of each instance.
  */
 parray *
-catalog_get_instance_list(void)
+catalog_get_instance_list(char *backup_catalog_path)
 {
 	char		path[MAXPGPATH];
 	DIR		   *dir;
@@ -702,7 +702,7 @@ catalog_get_instance_list(void)
 	instances = parray_new();
 
 	/* open directory and list contents */
-	join_path_components(path, backup_path, BACKUPS_DIR);
+	join_path_components(path, backup_catalog_path, BACKUPS_DIR);
 	dir = opendir(path);
 	if (dir == NULL)
 		elog(ERROR, "Cannot open directory \"%s\": %s",

src/init.c

@@ -49,7 +49,7 @@ do_init(char *backup_catalog_path)
 }
 
 int
-do_add_instance(InstanceConfig *instance)
+do_add_instance(char *backup_catalog_path, InstanceConfig *instance)
 {
 	char		path[MAXPGPATH];
 	char		arclog_path_dir[MAXPGPATH];
@@ -66,14 +66,14 @@ do_add_instance(InstanceConfig *instance)
 	instance->xlog_seg_size = get_xlog_seg_size(instance->pgdata);
 
 	/* Ensure that all root directories already exist */
-	if (access(backup_path, F_OK) != 0)
-		elog(ERROR, "Directory does not exist: '%s'", backup_path);
+	if (access(backup_catalog_path, F_OK) != 0)
+		elog(ERROR, "Directory does not exist: '%s'", backup_catalog_path);
 
-	join_path_components(path, backup_path, BACKUPS_DIR);
+	join_path_components(path, backup_catalog_path, BACKUPS_DIR);
 	if (access(path, F_OK) != 0)
 		elog(ERROR, "Directory does not exist: '%s'", path);
 
-	join_path_components(arclog_path_dir, backup_path, "wal");
+	join_path_components(arclog_path_dir, backup_catalog_path, "wal");
 	if (access(arclog_path_dir, F_OK) != 0)
 		elog(ERROR, "Directory does not exist: '%s'", arclog_path_dir);
 

src/pg_probackup.c

@@ -743,7 +743,7 @@ main(int argc, char *argv[])
 						   wal_file_path, wal_file_name, batch_size, !no_validate_wal);
 			break;
 		case ADD_INSTANCE_CMD:
-			return do_add_instance(&instance_config);
+			return do_add_instance(backup_path, &instance_config);
 		case DELETE_INSTANCE_CMD:
 			return do_delete_instance();
 		case INIT_CMD:
@@ -770,7 +770,7 @@ main(int argc, char *argv[])
 				if (datname_exclude_list || datname_include_list)
 					elog(ERROR, "You must specify parameter (-i, --backup-id) for partial validation");
 
-				return do_validate_all();
+				return do_validate_all(backup_path);
 			}
 			else
 				/* PITR validation and, optionally, partial validation */
@@ -779,7 +779,7 @@ main(int argc, char *argv[])
 						  restore_params,
 						  no_sync);
 		case SHOW_CMD:
-			return do_show(instance_name, current.backup_id, show_archive);
+			return do_show(backup_path, instance_name, current.backup_id, show_archive);
 		case DELETE_CMD:
 			if (delete_expired && backup_id_string)
 				elog(ERROR, "You cannot specify --delete-expired and (-i, --backup-id) options together");

src/pg_probackup.h

@@ -840,7 +840,7 @@ extern parray *read_database_map(pgBackup *backup);
 
 /* in init.c */
 extern int do_init(char *backup_catalog_path);
-extern int do_add_instance(InstanceConfig *instance);
+extern int do_add_instance(char *backup_catalog_path, InstanceConfig *instance);
 
 /* in archive.c */
 extern void do_archive_push(InstanceConfig *instance, char *wal_file_path,
@@ -856,7 +856,8 @@ extern void init_config(InstanceConfig *config, const char *instance_name);
 extern InstanceConfig *readInstanceConfigFile(const char *instance_name);
 
 /* in show.c */
-extern int do_show(const char *instance_name, time_t requested_backup_id, bool show_archive);
+extern int do_show(char *backup_catalog_path, const char *instance_name,
+				   time_t requested_backup_id, bool show_archive);
 
 /* in delete.c */
 extern void do_delete(time_t backup_id);
@@ -880,7 +881,7 @@ extern void help_command(ProbackupSubcmd const subcmd);
 
 /* in validate.c */
 extern void pgBackupValidate(pgBackup* backup, pgRestoreParams *params);
-extern int do_validate_all(void);
+extern int do_validate_all(char *backup_catalog_path);
 extern int validate_one_page(Page page, BlockNumber absolute_blkno,
 							 XLogRecPtr stop_lsn, PageState *page_st,
 							 uint32 checksum_version);
@@ -906,7 +907,7 @@ extern bool lock_backup(pgBackup *backup, bool strict, bool exclusive);
 extern const char *pgBackupGetBackupMode(pgBackup *backup, bool show_color);
 extern void pgBackupGetBackupModeColor(pgBackup *backup, char *mode);
 
-extern parray *catalog_get_instance_list(void);
+extern parray *catalog_get_instance_list(char *backup_catalog_path);
 extern parray *catalog_get_backup_list(const char *instance_name, time_t requested_backup_id);
 extern void catalog_lock_backup_list(parray *backup_list, int from_idx,
 									 int to_idx, bool strict, bool exclusive);

src/show.c

@@ -75,7 +75,8 @@ static int32 json_level = 0;
  * Entry point of pg_probackup SHOW subcommand.
  */
 int
-do_show(const char *instance_name, time_t requested_backup_id, bool show_archive)
+do_show(char *backup_catalog_path, const char *instance_name, 
+		time_t requested_backup_id, bool show_archive)
 {
 	int i;
 
@@ -93,7 +94,7 @@ do_show(const char *instance_name, time_t requested_backup_id, bool show_archive
 	 */
 	if (instance_name == NULL)
 	{
-		parray *instances = catalog_get_instance_list();
+		parray *instances = catalog_get_instance_list(backup_catalog_path);
 
 		show_instance_start();
 		for (i = 0; i < parray_num(instances); i++)
@@ -104,7 +105,7 @@ do_show(const char *instance_name, time_t requested_backup_id, bool show_archive
 			if (interrupted)
 				elog(ERROR, "Interrupted during show");
 
-			sprintf(backup_instance_path, "%s/%s/%s", backup_path, BACKUPS_DIR, instance->name);
+			sprintf(backup_instance_path, "%s/%s/%s", backup_catalog_path, BACKUPS_DIR, instance->name);
 
 			if (show_archive)
 				show_instance_archive(instance);

src/validate.c

@@ -382,7 +382,7 @@ pgBackupValidateFiles(void *arg)
  * If --instance option was provided, validate only backups of this instance.
  */
 int
-do_validate_all(void)
+do_validate_all(char *backup_catalog_path)
 {
 	corrupted_backup_found = false;
 	skipped_due_to_lock = false;
@@ -395,7 +395,7 @@ do_validate_all(void)
 		struct dirent *dent;
 
 		/* open directory and list contents */
-		join_path_components(path, backup_path, BACKUPS_DIR);
+		join_path_components(path, backup_catalog_path, BACKUPS_DIR);
 		dir = opendir(path);
 		if (dir == NULL)
 			elog(ERROR, "cannot open directory \"%s\": %s", path, strerror(errno));
@@ -425,8 +425,8 @@ do_validate_all(void)
 			 */
 			instance_name = dent->d_name;
 			sprintf(backup_instance_path, "%s/%s/%s",
-					backup_path, BACKUPS_DIR, instance_name);
-			sprintf(arclog_path, "%s/%s/%s", backup_path, "wal", instance_name);
+					backup_catalog_path, BACKUPS_DIR, instance_name);
+			sprintf(arclog_path, "%s/%s/%s", backup_catalog_path, "wal", instance_name);
 			join_path_components(conf_path, backup_instance_path,
 								 BACKUP_CATALOG_CONF_FILE);
 			if (config_read_opt(conf_path, instance_options, ERROR, false,