Refactoring. Introduce instanceState structure. Update code in init.c

Author: alubennikova

src/init.c

@@ -46,9 +46,10 @@ do_init(CatalogState *catalogState)
 }
 
 int
-do_add_instance(CatalogState *catalogState, InstanceConfig *instance)
+do_add_instance(InstanceState *instanceState, InstanceConfig *instance)
 {
 	struct stat st;
+	CatalogState *catalogState = instanceState->catalog_state;
 
 	/* PGDATA is always required */
 	if (instance->pgdata == NULL)
@@ -71,22 +72,22 @@ do_add_instance(CatalogState *catalogState, InstanceConfig *instance)
 	if (access(catalogState->wal_subdir_path, F_OK) != 0)
 		elog(ERROR, "Directory does not exist: '%s'", catalogState->wal_subdir_path);
 
-	if (stat(instance->backup_instance_path, &st) == 0 && S_ISDIR(st.st_mode))
+	if (stat(instanceState->instance_backup_subdir_path, &st) == 0 && S_ISDIR(st.st_mode))
 		elog(ERROR, "Instance '%s' backup directory already exists: '%s'",
-			instance->name, instance->backup_instance_path);
+			instanceState->instance_name, instanceState->instance_backup_subdir_path);
 
 	/*
 	 * Create directory for wal files of this specific instance.
 	 * Existence check is extra paranoid because if we don't have such a
 	 * directory in data dir, we shouldn't have it in wal as well.
 	 */
-	if (stat(instance->arclog_path, &st) == 0 && S_ISDIR(st.st_mode))
+	if (stat(instanceState->instance_wal_subdir_path, &st) == 0 && S_ISDIR(st.st_mode))
 		elog(ERROR, "Instance '%s' WAL archive directory already exists: '%s'",
-				instance->name, instance->arclog_path);
+				instanceState->instance_name, instanceState->instance_wal_subdir_path);
 
 	/* Create directory for data files of this specific instance */
-	dir_create_dir(instance->backup_instance_path, DIR_PERMISSION, false);
-	dir_create_dir(instance->arclog_path, DIR_PERMISSION, false);
+	dir_create_dir(instanceState->instance_backup_subdir_path, DIR_PERMISSION, false);
+	dir_create_dir(instanceState->instance_wal_subdir_path, DIR_PERMISSION, false);
 
 	/*
 	 * Write initial configuration file.

src/pg_probackup.c

@@ -142,6 +142,9 @@ static bool 		compress_shortcut = false;
 
 /* ================ instanceState =========== */
 char	   *instance_name;
+
+static InstanceState *instanceState = NULL;
+
 /* ================ instanceState (END) =========== */
 
 /* archive push options */
@@ -292,6 +295,7 @@ main(int argc, char *argv[])
 	pgBackupInit(&current);
 
 	/* Initialize current instance configuration */
+	//TODO get git of this global variable craziness
 	init_config(&instance_config, instance_name);
 
 	PROGRAM_NAME = get_progname(argv[0]);
@@ -459,6 +463,8 @@ main(int argc, char *argv[])
 
 	/* ===== catalogState (END) ======*/
 
+	/* ===== instanceState ======*/
+
 	/*
 	 * Option --instance is required for all commands except
 	 * init, show, checkdb and validate
@@ -470,9 +476,21 @@ main(int argc, char *argv[])
 			elog(ERROR, "required parameter not specified: --instance");
 	}
 	else
+	{
 		/* Set instance name */
 		instance_config.name = pgut_strdup(instance_name);
 
+		instanceState = pgut_new(InstanceState);
+		instanceState->catalog_state = catalogState;
+
+		strncpy(instanceState->instance_name, instance_name, MAXPGPATH);
+		join_path_components(instanceState->instance_backup_subdir_path,
+							catalogState->backup_subdir_path, instance_name);
+		join_path_components(instanceState->instance_wal_subdir_path,
+							catalogState->wal_subdir_path, instance_name);
+	}
+	/* ===== instanceState (END) ======*/
+
 	/*
 	 * If --instance option was passed, construct paths for backup data and
 	 * xlog files of this backup instance.
@@ -786,7 +804,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(catalogState, &instance_config);
+			return do_add_instance(instanceState, &instance_config);
 		case DELETE_INSTANCE_CMD:
 			return do_delete_instance();
 		case INIT_CMD:

src/pg_probackup.h

@@ -795,8 +795,23 @@ extern bool		delete_expired;
 extern bool		merge_expired;
 extern bool		dry_run;
 
-/* other options */
+/* ===== instanceState ===== */
 extern char *instance_name;
+typedef struct InstanceState
+{
+	/* catalog, this instance belongs to */
+	CatalogState *catalog_state;
+
+	char		instance_name[MAXPGPATH]; //previously global var instance_name
+	/* $BACKUP_PATH/backups/instance_name */
+	char		instance_backup_subdir_path[MAXPGPATH];
+	/* $BACKUP_PATH/backups/instance_name */
+	char		instance_wal_subdir_path[MAXPGPATH]; // previously global var arclog_path
+
+	//TODO add config here
+} InstanceState;
+
+/* ===== instanceState (END) ===== */
 
 /* show options */
 extern ShowFormat show_format;
@@ -856,7 +871,7 @@ extern parray *read_database_map(pgBackup *backup);
 
 /* in init.c */
 extern int do_init(CatalogState *catalogState);
-extern int do_add_instance(CatalogState *catalogState, InstanceConfig *instance);
+extern int do_add_instance(InstanceState *instanceState, InstanceConfig *instance);
 
 /* in archive.c */
 extern void do_archive_push(InstanceConfig *instance, char *wal_file_path,