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

standby clone: honour --waldir setting when cloning from Barman

Browse Source 
By setting --waldir in "pg_basebackup_options", standbys cloned using
pg_basebackup would have their WAL directory set to the specified
location and symlinked from the data directory.

This commit causes repmgr to honour that setting even when cloning
from Barman.
This commit is contained in:
Ian Barwick
2020-10-07 15:09:56 +09:00
parent b3b9281253
commit 4b524c52b6
7 changed files with 87 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
repmgr-action-standby.c
View File

@@ -6941,9 +6941,20 @@ run_file_backup(t_node_info *local_node_record)
/* For the foreseeable future, no other modes are supported */
Assert(mode == barman);
if (mode == barman)
{
t_basebackup_options backup_options = T_BASEBACKUP_OPTIONS_INITIALIZER;
Assert(source_server_version_num != UNKNOWN_SERVER_VERSION_NUM);
/*
* Parse the pg_basebackup_options provided in repmgr.conf - we need to
* check if --waldir/--xlogdir was provided.
*/
parse_pg_basebackup_options(config_file_options.pg_basebackup_options,
&backup_options,
source_server_version_num,
NULL);
/*
* Locate Barman's base backups directory
*/
@@ -7203,11 +7214,31 @@ run_file_backup(t_node_info *local_node_record)
if (vers[i] < 0 && source_server_version_num >= abs(vers[i]))
continue;
maxlen_snprintf(filename, "%s/%s", local_data_directory, dirs[i]);
/*
* If --waldir/--xlogdir specified in "pg_basebackup_options",
* create a symlink rather than make a directory.
*/
maxlen_snprintf(filename, "%s/%s", local_data_directory, dirs[i]);
if (strcmp(dirs[i], "pg_wal") == 0 || strcmp(dirs[i], "pg_xlog") == 0)
{
if (backup_options.waldir[0] != '\0')
{
if (create_pg_dir(backup_options.waldir, false) == false)
{
/* create_pg_dir() will log any errors */
exit(ERR_BAD_CONFIG);
}
if (symlink(backup_options.waldir, filename) != 0)
{
log_error(_("could not create symbolic link \"%s\""), filename);
exit(ERR_BAD_CONFIG);
}
continue;
}
}
if (mkdir(filename, S_IRWXU) != 0 && errno != EEXIST)
{
log_error(_("unable to create the %s directory"), dirs[i]);