From c1428a3ecdcc8011ae80da58a2160b169d1bf76e Mon Sep 17 00:00:00 2001
From: Ian Barwick <ian@2ndquadrant.com>
Date: Tue, 9 Jun 2020 10:51:37 +0900
Subject: [PATCH] standby clone: fixes for Barman tablespace handling.

repmgr creates a file with a list of tablespace files to fetch from
Barman, however the file may not actually have been flushed to disk
at the point the rsync operation was executed, so may be incomplete
or empty.

Also fix handling of tablespace remapping.

Addresses GitHub #650.
---
 repmgr-action-standby.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/repmgr-action-standby.c b/repmgr-action-standby.c
index e2aefaac..718711f6 100644
--- a/repmgr-action-standby.c
+++ b/repmgr-action-standby.c
@@ -7177,11 +7177,13 @@ run_file_backup(t_node_info *local_node_record)
 
 		if (mode == barman)
 		{
-			create_pg_dir(cell_t->location, false);
+			create_pg_dir(tblspc_dir_dest, false);
 
 			if (cell_t->f != NULL)	/* cell_t->f == NULL iff the tablespace is
 									 * empty */
 			{
+				fclose(cell_t->f);
+
 				maxlen_snprintf(command,
 								"rsync --progress -a --files-from=%s/%s.txt %s:%s/%s/%s %s",
 								local_repmgr_tmp_directory,
@@ -7194,7 +7196,6 @@ run_file_backup(t_node_info *local_node_record)
 				(void) local_command(
 									 command,
 									 NULL);
-				fclose(cell_t->f);
 				maxlen_snprintf(filename,
 								"%s/%s.txt",
 								local_repmgr_tmp_directory,
@@ -7311,7 +7312,10 @@ stop_backup:
 
 	if (mode == barman)
 	{
-		/* In Barman mode, remove local_repmgr_directory */
+		/*
+		 * In Barman mode, remove local_repmgr_tmp_directory,
+		 * which contains various temporary files containing Barman metadata.
+		 */
 		rmtree(local_repmgr_tmp_directory, true);
 	}