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

repmgr: in standby clone, always add user-supplied connection information to upstream default parameters

Browse Source 
Also misc other cleanup and documentation.
This commit is contained in:
Ian Barwick
2016-09-01 12:06:19 +09:00
parent d12ecba63c
commit 2105837ef4
1 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
repmgr.c
View File

@@ -1846,8 +1846,36 @@ do_standby_clone(void)
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
/*
* Initialise list of conninfo parameters which will later be used
* to create the `primary_conninfo` string in recovery.conf .
*
* We'll initialise it with the default values as seen by libpq,
* and overwrite them with the host settings specified on the command
* line. As it's possible the standby will be cloned from a node different
* to its intended upstream, we'll later attempt to fetch the
* upstream node record and overwrite the values set here with
* those from the upstream node record.
*/
initialize_conninfo_params(&upstream_conninfo, true); initialize_conninfo_params(&upstream_conninfo, true);
if (strlen(runtime_options.host))
{
param_set(&upstream_conninfo, "host", runtime_options.host);
}
if (strlen(runtime_options.masterport))
{
param_set(&upstream_conninfo, "port", runtime_options.masterport);
}
if (strlen(runtime_options.dbname))
{
param_set(&upstream_conninfo, "dbname", runtime_options.dbname);
}
if (strlen(runtime_options.username))
{
param_set(&upstream_conninfo, "user", runtime_options.username);
}
/* Sanity-check barman connection and installation */ /* Sanity-check barman connection and installation */
if (mode == barman) if (mode == barman)
{ {
@@ -1987,11 +2015,9 @@ do_standby_clone(void)
*/ */
conn_to_param_list(source_conn, &upstream_conninfo); conn_to_param_list(source_conn, &upstream_conninfo);
// now set up conninfo params for the actual upstream, as we may be cloning from a different node /*
// if upstream conn * Attempt to find the upstream node record
// get upstream node rec directly */
if (options.upstream_node == NO_UPSTREAM_NODE) if (options.upstream_node == NO_UPSTREAM_NODE)
upstream_node_id = get_master_node_id(source_conn, options.cluster_name); upstream_node_id = get_master_node_id(source_conn, options.cluster_name);
else else
@@ -2018,18 +2044,18 @@ do_standby_clone(void)
* name with the repmgr one (they could well be different) and remotely execute * name with the repmgr one (they could well be different) and remotely execute
* psql. * psql.
*/ */
char buf[MAXLEN]; char buf[MAXLEN];
char barman_conninfo_str[MAXLEN]; char barman_conninfo_str[MAXLEN];
t_conninfo_param_list barman_conninfo; t_conninfo_param_list barman_conninfo;
char *errmsg = NULL; char *errmsg = NULL;
bool parse_success; bool parse_success,
char where_condition[MAXLEN]; command_success;
char where_condition[MAXLEN];
PQExpBufferData command_output; PQExpBufferData command_output;
PQExpBufferData repmgr_conninfo_buf; PQExpBufferData repmgr_conninfo_buf;
int c; int c;
/* XXX barman also returns "streaming_conninfo" - what's the difference? */
get_barman_property(barman_conninfo_str, "conninfo", local_repmgr_directory); get_barman_property(barman_conninfo_str, "conninfo", local_repmgr_directory);
initialize_conninfo_params(&barman_conninfo, false); initialize_conninfo_params(&barman_conninfo, false);
@@ -2047,7 +2073,6 @@ do_standby_clone(void)
param_set(&barman_conninfo, "dbname", runtime_options.dbname); param_set(&barman_conninfo, "dbname", runtime_options.dbname);
/* Rebuild the Barman conninfo string */ /* Rebuild the Barman conninfo string */
initPQExpBuffer(&repmgr_conninfo_buf); initPQExpBuffer(&repmgr_conninfo_buf);
for (c = 0; c < barman_conninfo.size && barman_conninfo.keywords[c] != NULL; c++) for (c = 0; c < barman_conninfo.size && barman_conninfo.keywords[c] != NULL; c++)
@@ -2087,8 +2112,13 @@ do_standby_clone(void)
termPQExpBuffer(&repmgr_conninfo_buf); termPQExpBuffer(&repmgr_conninfo_buf);
// XXX check success command_success = local_command(buf, &command_output);
(void)local_command(buf, &command_output);
if (command_success == false)
{
log_err(_("Unable to execute database query via Barman server\n"));
exit(ERR_BARMAN);
}
maxlen_snprintf(upstream_conninfo_str, "%s", command_output.data); maxlen_snprintf(upstream_conninfo_str, "%s", command_output.data);
string_remove_trailing_newlines(upstream_conninfo_str); string_remove_trailing_newlines(upstream_conninfo_str);
@@ -2100,9 +2130,6 @@ do_standby_clone(void)
termPQExpBuffer(&command_output); termPQExpBuffer(&command_output);
} }
printf("upstream found? %c\n", upstream_record_found == true ? 'y' : 'n');
if (upstream_record_found == true) if (upstream_record_found == true)
{ {
/* parse returned upstream conninfo string to recovery primary_conninfo params*/ /* parse returned upstream conninfo string to recovery primary_conninfo params*/
@@ -2137,22 +2164,6 @@ do_standby_clone(void)
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
if (strlen(runtime_options.host))
{
param_set(&upstream_conninfo, "host", runtime_options.host);
}
if (strlen(runtime_options.masterport))
{
param_set(&upstream_conninfo, "port", runtime_options.masterport);
}
if (strlen(runtime_options.dbname))
{
param_set(&upstream_conninfo, "dbname", runtime_options.dbname);
}
if (strlen(runtime_options.username))
{
param_set(&upstream_conninfo, "user", runtime_options.username);
}
} }
if (mode != barman) if (mode != barman)