Move all backups to "backups" subdir.

stalkerg · stalkerg · commit 78362a52d60c · 2016-11-07T17:35:53.000+03:00
diff --git a/catalog.c b/catalog.c
@@ -111,15 +111,17 @@ catalog_get_backup_list(time_t backup_id)
 	DIR			   *date_dir = NULL;
 	struct dirent  *date_ent = NULL;
 	DIR			   *time_dir = NULL;
+	char			backups_path[MAXPGPATH];
 	char			date_path[MAXPGPATH];
 	parray		   *backups = NULL;
 	pgBackup	   *backup = NULL;
 
 	/* open backup root directory */
-	date_dir = opendir(backup_path);
+	join_path_components(backups_path, backup_path, BACKUPS_DIR);
+	date_dir = opendir(backups_path);
 	if (date_dir == NULL)
 	{
-		elog(WARNING, "cannot open directory \"%s\": %s", backup_path,
+		elog(WARNING, "cannot open directory \"%s\": %s", backups_path,
 			strerror(errno));
 		goto err_proc;
 	}
@@ -131,15 +133,11 @@ catalog_get_backup_list(time_t backup_id)
 		char ini_path[MAXPGPATH];
 
 		/* skip not-directory entries and hidden entries */
-		if (!IsDir(backup_path, date_ent->d_name) || date_ent->d_name[0] == '.')
-			continue;
-
-		/* skip online WAL backup directory */
-		if (strcmp(date_ent->d_name, RESTORE_WORK_DIR) == 0)
+		if (!IsDir(backups_path, date_ent->d_name) || date_ent->d_name[0] == '.')
 			continue;
 
 		/* open subdirectory (date directory) and search time directory */
-		join_path_components(date_path, backup_path, date_ent->d_name);
+		join_path_components(date_path, backups_path, date_ent->d_name);
 
 		/* read backup information from backup.ini */
 		snprintf(ini_path, MAXPGPATH, "%s/%s", date_path, BACKUP_INI_FILE);
@@ -166,7 +164,7 @@ catalog_get_backup_list(time_t backup_id)
 	if (errno)
 	{
 		elog(WARNING, "cannot read backup root directory \"%s\": %s",
-			backup_path, strerror(errno));
+			backups_path, strerror(errno));
 		goto err_proc;
 	}
 
@@ -492,9 +490,9 @@ pgBackupGetPath(const pgBackup *backup, char *path, size_t len, const char *subd
 
 	datetime = base36enc(backup->start_time);
 	if (subdir)
-		snprintf(path, len, "%s/%s/%s", backup_path, datetime, subdir);
+		snprintf(path, len, "%s/%s/%s/%s", backup_path, BACKUPS_DIR, datetime, subdir);
 	else
-		snprintf(path, len, "%s/%s", backup_path, datetime);
+		snprintf(path, len, "%s/%s/%s", backup_path, BACKUPS_DIR, datetime);
 	free(datetime);
 }
 
diff --git a/expected/init.out b/expected/init.out
@@ -3,21 +3,21 @@
 ###### success with archive_command ######
 0
 results/init/backup/
-results/init/backup/backup/
+results/init/backup/backups/
 results/init/backup/pg_arman.ini
 results/init/backup/wal/
 ###### INIT COMMAND TEST-0002 ######
 ###### success with archive_command and log_directory ######
 0
 results/init/backup/
-results/init/backup/backup/
+results/init/backup/backups/
 results/init/backup/pg_arman.ini
 results/init/backup/wal/
 ###### INIT COMMAND TEST-0003 ######
 ###### success without archive_command ######
 0
 results/init/backup/
-results/init/backup/backup/
+results/init/backup/backups/
 results/init/backup/pg_arman.ini
 results/init/backup/wal/
 ###### INIT COMMAND TEST-0004 ######
diff --git a/init.c b/init.c
@@ -48,7 +48,7 @@ do_init(void)
 	dir_create_dir(backup_path, DIR_PERMISSION);
 
 	/* create directories for backup of online files */
-	join_path_components(path, backup_path, RESTORE_WORK_DIR);
+	join_path_components(path, backup_path, BACKUPS_DIR);
 	dir_create_dir(path, DIR_PERMISSION);
 
 	/* read postgresql.conf */
diff --git a/pg_arman.h b/pg_arman.h
@@ -31,7 +31,7 @@
 
 /* Directory/File names */
 #define DATABASE_DIR			"database"
-#define RESTORE_WORK_DIR		"backup"
+#define BACKUPS_DIR				"backups"
 #define PG_XLOG_DIR				"pg_xlog"
 #define PG_TBLSPC_DIR			"pg_tblspc"
 #define BACKUP_INI_FILE			"backup.ini"
diff --git a/restore.c b/restore.c
@@ -514,23 +514,13 @@ readTimeLineHistory(TimeLineID targetTLI)
 	/* search from arclog_path first */
 	snprintf(path, lengthof(path), "%s/%08X.history", arclog_path,
 		targetTLI);
+
 	fd = fopen(path, "rt");
 	if (fd == NULL)
 	{
 		if (errno != ENOENT)
 			elog(ERROR, "could not open file \"%s\": %s", path,
 				strerror(errno));
-
-		/* search from restore work directory next */
-		snprintf(path, lengthof(path), "%s/%s/%s/%08X.history", backup_path,
-			RESTORE_WORK_DIR, PG_XLOG_DIR, targetTLI);
-		fd = fopen(path, "rt");
-		if (fd == NULL)
-		{
-			if (errno != ENOENT)
-				elog(ERROR, "could not open file \"%s\": %s", path,
-						strerror(errno));
-		}
 	}
 
 	/*
