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

Make "pgdata" a mandatory configuration file setting

Browse Source 
There are some circumstances, e.g. during switchover operations,
where repmgr may need to operate on a data directory while the
server isn't running, in which case there's no way to retrieve
that information.
This commit is contained in:
Ian Barwick
2017-08-02 23:04:24 +09:00
parent 83cda89362
commit c67aa15581
6 changed files with 54 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
repmgr-action-standby.c
View File

@@ -99,17 +99,22 @@ do_standby_clone(void)
mode = get_standby_clone_mode();
/*
* If a data directory (-D/--pgdata) was provided, use that, otherwise
* repmgr will default to using the same directory path as on the source
* host.
* Copy the provided data directory; if a configuration file was provided,
* use the (mandatory) value from that; if -D/--pgdata was provided, use that;
* otherwise repmgr will default to using the same directory path as on the
* source host. The last case will only ever occur when executing "repmgr
* standby clone" with no configuration file.
*
* Note that barman mode requires -D/--pgdata.
*
* If -D/--pgdata is not supplied, and we're not cloning from barman,
* If no data directory is explicitly provided, and we're not cloning from barman,
* the source host's data directory will be fetched later, after
* we've connected to it.
* we've connected to it, in check_source_server().
*
*/
if (runtime_options.data_dir[0])
get_node_data_directory(local_data_directory);
if (local_data_directory[0] != '\0')
{
local_data_directory_provided = true;
log_notice(_("destination directory \"%s\" provided"),
@@ -125,19 +130,6 @@ do_standby_clone(void)
exit(ERR_BAD_CONFIG);
}
/*
* Target directory (-D/--pgdata) provided - use that as new data directory
* (useful when executing backup on local machine only or creating the backup
* in a different local directory when backup source is a remote host)
*
* Note: if no directory provided, check_source_server() will later set
* local_data_directory from the upstream configuration.
*/
if (local_data_directory_provided == true)
{
strncpy(local_data_directory, runtime_options.data_dir, MAXPGPATH);
}
/* Sanity-check barman connection and installation */
if (mode == barman)
{