Refactoring. Get rid of global variable archlog_path

Author: alubennikova

src/backup.c

@@ -262,9 +262,9 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 	if (current.backup_mode == BACKUP_MODE_DIFF_PAGE || !stream_wal)
 	{
 		/* Check that archive_dir can be reached */
-		if (fio_access(arclog_path, F_OK, FIO_BACKUP_HOST) != 0)
+		if (fio_access(instanceState->instance_wal_subdir_path, F_OK, FIO_BACKUP_HOST) != 0)
 			elog(ERROR, "WAL archive directory is not accessible \"%s\": %s",
-				arclog_path, strerror(errno));
+				instanceState->instance_wal_subdir_path, strerror(errno));
 
 		/*
 		 * Do not wait start_lsn for stream backup.
@@ -391,7 +391,8 @@ do_backup_pg(InstanceState *instanceState, PGconn *backup_conn,
 			 * reading WAL segments present in archives up to the point
 			 * where this backup has started.
 			 */
-			pagemap_isok = extractPageMap(arclog_path, instance_config.xlog_seg_size,
+			pagemap_isok = extractPageMap(instanceState->instance_wal_subdir_path,
+						   instance_config.xlog_seg_size,
 						   prev_backup->start_lsn, prev_backup->tli,
 						   current.start_lsn, current.tli, tli_list);
 		}
@@ -1306,8 +1307,8 @@ wait_wal_lsn(InstanceState *instanceState, XLogRecPtr target_lsn, bool is_start_
 	}
 	else
 	{
-		join_path_components(wal_segment_path, arclog_path, wal_segment);
-		wal_segment_dir = arclog_path;
+		join_path_components(wal_segment_path, instanceState->instance_wal_subdir_path, wal_segment);
+		wal_segment_dir = instanceState->instance_wal_subdir_path;
 	}
 
 	/* TODO: remove this in 3.0 (it is a cludge against some old bug with archive_timeout) */
@@ -1682,7 +1683,7 @@ pg_stop_backup(InstanceState *instanceState, pgBackup *backup, PGconn *pg_startb
 				xlog_path = stream_xlog_path;
 			}
 			else
-				xlog_path = arclog_path;
+				xlog_path = instanceState->instance_wal_subdir_path;
 
 			GetXLogSegNo(stop_backup_lsn_tmp, segno, instance_config.xlog_seg_size);
 
@@ -1896,7 +1897,7 @@ pg_stop_backup(InstanceState *instanceState, pgBackup *backup, PGconn *pg_startb
 			xlog_path = stream_xlog_path;
 		}
 		else
-			xlog_path = arclog_path;
+			xlog_path = instanceState->instance_wal_subdir_path;
 
 		backup->stop_lsn = stop_backup_lsn;
 		backup->recovery_xid = recovery_xid;

src/delete.c

@@ -989,7 +989,7 @@ do_delete_instance(InstanceState *instanceState)
 	parray_free(backup_list);
 
 	/* Delete all wal files. */
-	pgut_rmtree(arclog_path, false, true);
+	pgut_rmtree(instanceState->instance_wal_subdir_path, false, true);
 
 	/* Delete backup instance config file */
 	if (remove(instanceState->instance_config_path))
@@ -1003,8 +1003,8 @@ do_delete_instance(InstanceState *instanceState)
 		elog(ERROR, "Can't remove \"%s\": %s", instanceState->instance_backup_subdir_path,
 			strerror(errno));
 
-	if (rmdir(arclog_path) != 0)
-		elog(ERROR, "Can't remove \"%s\": %s", arclog_path,
+	if (rmdir(instanceState->instance_wal_subdir_path) != 0)
+		elog(ERROR, "Can't remove \"%s\": %s", instanceState->instance_wal_subdir_path,
 			strerror(errno));
 
 	elog(INFO, "Instance '%s' successfully deleted", instanceState->instance_name);

src/pg_probackup.c

@@ -69,11 +69,6 @@ static char	   *backup_path = NULL;
  * $BACKUP_PATH/backups/instance_name
  */
 static char		backup_instance_path[MAXPGPATH];
-/*
- * path or to the wal files in the backup catalog
- * $BACKUP_PATH/wal/instance_name
- */
-char		arclog_path[MAXPGPATH] = "";
 
 static CatalogState *catalogState = NULL;
 /* ================ catalogState (END) =========== */
@@ -510,7 +505,6 @@ main(int argc, char *argv[])
 		 */
 		sprintf(backup_instance_path, "%s/%s/%s",
 				backup_path, BACKUPS_DIR, instance_name);
-		sprintf(arclog_path, "%s/%s/%s", backup_path, "wal", instance_name);
 
 		/*
 		 * Fill InstanceConfig structure fields used to generate pathes inside

src/pg_probackup.h

@@ -755,13 +755,6 @@ typedef struct BackupPageHeader2
 
 #define IsSshProtocol() (instance_config.remote.host && strcmp(instance_config.remote.proto, "ssh") == 0)
 
-/* ====== CatalogState ======= */
-
-/* directory options */
-extern char		arclog_path[MAXPGPATH];
-
-/* ====== CatalogState (END) ======= */
-
 /* common options */
 extern pid_t    my_pid;
 extern __thread int my_thread_num;

src/restore.c

@@ -287,7 +287,8 @@ do_restore_or_validate(InstanceState *instanceState, time_t target_backup_id, pg
 
 			//	elog(LOG, "target timeline ID = %u", rt->target_tli);
 				/* Read timeline history files from archives */
-				timelines = read_timeline_history(arclog_path, rt->target_tli, true);
+				timelines = read_timeline_history(instanceState->instance_wal_subdir_path,
+												  rt->target_tli, true);
 
 				if (!satisfy_timeline(timelines, current_backup))
 				{
@@ -489,7 +490,8 @@ do_restore_or_validate(InstanceState *instanceState, time_t target_backup_id, pg
 			elog(ERROR, "Incremental restore in 'lsn' mode require "
 				"data_checksums to be enabled in destination data directory");
 
-		timelines = read_timeline_history(arclog_path, redo.tli, false);
+		timelines = read_timeline_history(instanceState->instance_wal_subdir_path,
+										  redo.tli, false);
 
 		if (!timelines)
 			elog(WARNING, "Failed to get history for redo timeline %i, "
@@ -604,7 +606,7 @@ do_restore_or_validate(InstanceState *instanceState, time_t target_backup_id, pg
 			 * We pass base_full_backup timeline as last argument to this function,
 			 * because it's needed to form the name of xlog file.
 			 */
-			validate_wal(dest_backup, arclog_path, rt->target_time,
+			validate_wal(dest_backup, instanceState->instance_wal_subdir_path, rt->target_time,
 						 rt->target_xid, rt->target_lsn,
 						 dest_backup->tli, instance_config.xlog_seg_size);
 		}

src/validate.c

@@ -433,9 +433,6 @@ do_validate_all(CatalogState *catalogState, InstanceState *instanceState)
 								catalogState->wal_subdir_path, instanceState->instance_name);
 			join_path_components(instanceState->instance_config_path,
 								 instanceState->instance_backup_subdir_path, BACKUP_CATALOG_CONF_FILE);
-#ifdef REFACTORE_ME
-			sprintf(arclog_path, "%s/%s/%s", catalogState->catalog_path, "wal", instanceState->instance_name);
-#endif
 
 			if (config_read_opt(instanceState->instance_config_path, instance_options, ERROR, false,
 								true) == 0)
@@ -587,7 +584,7 @@ do_validate_instance(InstanceState *instanceState)
 
 		/* Validate corresponding WAL files */
 		if (current_backup->status == BACKUP_STATUS_OK)
-			validate_wal(current_backup, arclog_path, 0,
+			validate_wal(current_backup, instanceState->instance_wal_subdir_path, 0,
 						 0, 0, current_backup->tli,
 						 instance_config.xlog_seg_size);
 
@@ -684,7 +681,7 @@ do_validate_instance(InstanceState *instanceState)
 							{
 
 								/* Revalidation successful, validate corresponding WAL files */
-								validate_wal(backup, arclog_path, 0,
+								validate_wal(backup, instanceState->instance_wal_subdir_path, 0,
 											 0, 0, backup->tli,
 											 instance_config.xlog_seg_size);
 							}