github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-24 15:46:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

When cloning from Barman, use basebackups_directory

Browse Source 
See: https://github.com/2ndQuadrant/repmgr/issues/312
This commit is contained in:
Ian Barwick
2017-07-07 13:39:10 +09:00
parent 35df85e67d
commit b08511ec79
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
repmgr-action-standby.c
View File

@@ -2274,9 +2274,9 @@ run_file_backup(void)
char command[MAXLEN]; char command[MAXLEN];
char filename[MAXLEN]; char filename[MAXLEN];
char buf[MAXLEN]; char buf[MAXLEN];
char backup_directory[MAXLEN]; char basebackups_directory[MAXLEN];
char backup_id[MAXLEN] = ""; char backup_id[MAXLEN] = "";
char *p, *q; char *p, *q;
PQExpBufferData command_output; PQExpBufferData command_output;
TablespaceDataList tablespace_list = { NULL, NULL }; TablespaceDataList tablespace_list = { NULL, NULL };
TablespaceDataListCell *cell_t; TablespaceDataListCell *cell_t;
@@ -2287,10 +2287,10 @@ run_file_backup(void)
if (mode == barman) if (mode == barman)
{ {
/* /*
* Locate Barman's backup directory * Locate Barman's base backups directory
*/ */
get_barman_property(backup_directory, "backup_directory", local_repmgr_tmp_directory); get_barman_property(basebackups_directory, "basebackups_directory", local_repmgr_tmp_directory);
/* /*
* Read the list of backup files into a local file. In the * Read the list of backup files into a local file. In the
@@ -2313,6 +2313,8 @@ run_file_backup(void)
make_barman_ssh_command(barman_command_buf), make_barman_ssh_command(barman_command_buf),
config_file_options.barman_server); config_file_options.barman_server);
log_verbose(LOG_DEBUG, "executing:\n %s\n", command);
fi = popen(command, "r"); fi = popen(command, "r");
if (fi == NULL) if (fi == NULL)
{ {
@@ -2324,10 +2326,11 @@ run_file_backup(void)
if (fd == NULL) if (fd == NULL)
{ {
log_error("cannot open file: %s", datadir_list_filename); log_error("cannot open file: %s", datadir_list_filename);
exit(ERR_INTERNAL); exit(ERR_BARMAN);
} }
maxlen_snprintf(prefix, "%s/base/", backup_directory); maxlen_snprintf(prefix, "%s/", basebackups_directory);
while (fgets(output, MAXLEN, fi) != NULL) while (fgets(output, MAXLEN, fi) != NULL)
{ {
/* /*
@@ -2361,9 +2364,9 @@ run_file_backup(void)
* Copy backup.info * Copy backup.info
*/ */
maxlen_snprintf(command, maxlen_snprintf(command,
"rsync -a %s:%s/base/%s/backup.info %s", "rsync -a %s:%s/%s/backup.info %s",
config_file_options.barman_host, config_file_options.barman_host,
backup_directory, basebackups_directory,
backup_id, backup_id,
local_repmgr_tmp_directory); local_repmgr_tmp_directory);
(void)local_command( (void)local_command(
@@ -2469,10 +2472,10 @@ run_file_backup(void)
* Copy all backup files from the Barman server * Copy all backup files from the Barman server
*/ */
maxlen_snprintf(command, maxlen_snprintf(command,
"rsync --progress -a --files-from=%s %s:%s/base/%s/data %s", "rsync --progress -a --files-from=%s %s:%s/%s/data %s",
datadir_list_filename, datadir_list_filename,
config_file_options.barman_host, config_file_options.barman_host,
backup_directory, basebackups_directory,
backup_id, backup_id,
local_data_directory); local_data_directory);
@@ -2574,7 +2577,7 @@ run_file_backup(void)
local_repmgr_tmp_directory, local_repmgr_tmp_directory,
cell_t->oid, cell_t->oid,
config_file_options.barman_host, config_file_options.barman_host,
backup_directory, basebackups_directory,
backup_id, backup_id,
cell_t->oid, cell_t->oid,
tblspc_dir_dest); tblspc_dir_dest);