Remove external directories files from previous backups

Author: za-arthur

src/backup.c

@@ -504,7 +504,8 @@ do_backup_instance(void)
 	elog(LOG, "Database backup start");
 	if(current.external_dir_str)
 	{
-		external_dirs = make_external_directory_list(current.external_dir_str);
+		external_dirs = make_external_directory_list(current.external_dir_str,
+													 false);
 		check_external_for_tablespaces(external_dirs);
 	}
 

src/catalog.c

@@ -477,7 +477,8 @@ pgBackupCreateDir(pgBackup *backup)
 	{
 		parray *external_list;
 
-		external_list = make_external_directory_list(backup->external_dir_str);
+		external_list = make_external_directory_list(backup->external_dir_str,
+													 false);
 		for (i = 0; i < parray_num(external_list); i++)
 		{
 			char		temp[MAXPGPATH];

src/dir.c

@@ -1311,7 +1311,9 @@ check_external_dir_mapping(pgBackup *backup)
 		return;
 	}
 
-	external_dirs_to_restore = make_external_directory_list(backup->external_dir_str);
+	external_dirs_to_restore = make_external_directory_list(
+													backup->external_dir_str,
+													false);
 	/* 1 - each OLDDIR must have an entry in external_dirs_to_restore */
 	for (cell = external_remap_list.head; cell; cell = cell->next)
 	{
@@ -1707,11 +1709,11 @@ pgFileSize(const char *path)
 }
 
 /*
- * Construct parray containing external directories paths
+ * Construct parray containing remmaped external directories paths
  * from string like /path1:/path2
  */
 parray *
-make_external_directory_list(const char *colon_separated_dirs)
+make_external_directory_list(const char *colon_separated_dirs, bool remap)
 {
 	char	   *p;
 	parray	   *list = parray_new();
@@ -1730,7 +1732,20 @@ make_external_directory_list(const char *colon_separated_dirs)
 
 		canonicalize_path(external_path);
 		if (is_absolute_path(external_path))
+		{
+			if (remap)
+			{
+				char	   *full_path = get_external_remap(external_path);
+
+				if (full_path != external_path)
+				{
+					full_path = pg_strdup(full_path);
+					pfree(external_path);
+					external_path = full_path;
+				}
+			}
 			parray_append(list, external_path);
+		}
 		else
 			elog(ERROR, "External directory \"%s\" is not an absolute path",
 				 external_path);

src/merge.c

@@ -262,9 +262,11 @@ merge_backups(pgBackup *to_backup, pgBackup *from_backup)
 
 	/* Create external directories lists */
 	if (to_backup->external_dir_str)
-		to_external = make_external_directory_list(to_backup->external_dir_str);
+		to_external = make_external_directory_list(to_backup->external_dir_str,
+												   false);
 	if (from_backup->external_dir_str)
-		from_external = make_external_directory_list(from_backup->external_dir_str);
+		from_external = make_external_directory_list(from_backup->external_dir_str,
+													 false);
 
 	/*
 	 * Rename external directoties in to_backup (if exists)

src/pg_probackup.h

@@ -585,7 +585,8 @@ extern void print_file_list(FILE *out, const parray *files, const char *root,
 							const char *external_prefix, parray *external_list);
 extern parray *dir_read_file_list(const char *root, const char *external_prefix,
 								  const char *file_txt, fio_location location);
-extern parray *make_external_directory_list(const char *colon_separated_dirs);
+extern parray *make_external_directory_list(const char *colon_separated_dirs,
+											bool remap);
 extern void free_dir_list(parray *list);
 extern void makeExternalDirPathByNum(char *ret_path, const char *pattern_path,
 									 const int dir_num);