github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 08:36:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Always pass -D/--pgdata option to pg_basebackup

Browse Source 
repmgr does not require explicit provision of the target data
directory when cloning a standby (it defaults to the same directory
as on the master). However this is a required option for pg_basebackup
which was only being provided if repmgr's -D/--data-dir option was
set, so ensure we always provide whatever repmgr is using.

Per report from Martín.
This commit is contained in:
Ian Barwick
2015-08-25 14:36:51 +09:00
parent ae47e5f413
commit eb0af7ca23
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
repmgr.c
View File

@@ -69,7 +69,7 @@ static bool create_recovery_file(const char *data_dir);
static int test_ssh_connection(char *host, char *remote_user); static int test_ssh_connection(char *host, char *remote_user);
static int copy_remote_files(char *host, char *remote_user, char *remote_path, static int copy_remote_files(char *host, char *remote_user, char *remote_path,
char *local_path, bool is_directory, int server_version_num); char *local_path, bool is_directory, int server_version_num);
static int run_basebackup(void); static int run_basebackup(const char *data_dir);
static void check_parameters_for_action(const int action); static void check_parameters_for_action(const int action);
static bool create_schema(PGconn *conn); static bool create_schema(PGconn *conn);
static void write_primary_conninfo(char *line); static void write_primary_conninfo(char *line);
@@ -1321,7 +1321,7 @@ do_standby_clone(void)
} }
else else
{ {
r = run_basebackup(); r = run_basebackup(local_data_directory);
if (r != 0) if (r != 0)
{ {
log_warning(_("standby clone: base backup failed\n")); log_warning(_("standby clone: base backup failed\n"));
@@ -2489,7 +2489,7 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
static int static int
run_basebackup() run_basebackup(const char *data_dir)
{ {
char script[MAXLEN]; char script[MAXLEN];
int r = 0; int r = 0;
@@ -2500,6 +2500,8 @@ run_basebackup()
initPQExpBuffer(&params); initPQExpBuffer(&params);
appendPQExpBuffer(&params, " -D %s", data_dir);
if(strlen(runtime_options.host)) if(strlen(runtime_options.host))
{ {
appendPQExpBuffer(&params, " -h %s", runtime_options.host); appendPQExpBuffer(&params, " -h %s", runtime_options.host);
@@ -2515,11 +2517,6 @@ run_basebackup()
appendPQExpBuffer(&params, " -U %s", runtime_options.username); appendPQExpBuffer(&params, " -U %s", runtime_options.username);
} }
if(strlen(runtime_options.dest_dir))
{
appendPQExpBuffer(&params, " -D %s", runtime_options.dest_dir);
}
if(runtime_options.fast_checkpoint) { if(runtime_options.fast_checkpoint) {
appendPQExpBuffer(&params, " -c fast"); appendPQExpBuffer(&params, " -c fast");
} }