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

Ensure parsed value of --upstream-conninfo is written to recovery.conf

Browse Source 
Previously it was being parsed (a step which ensures any "application_name"
set by the caller is changed to the node name), but the original string
was being copied to "primary_conninfo" anyway.
This commit is contained in:
Ian Barwick
2019-06-06 11:18:20 +09:00
parent 55dc4f7a5f
commit cfc41392c3
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
repmgr-action-standby.c
View File

@@ -112,7 +112,7 @@ static void get_barman_property(char *dst, char *name, char *local_repmgr_direct
static int get_tablespace_data_barman(char *, TablespaceDataList *); static int get_tablespace_data_barman(char *, TablespaceDataList *);
static char *make_barman_ssh_command(char *buf); static char *make_barman_ssh_command(char *buf);
static bool create_recovery_file(t_node_info *node_record, t_conninfo_param_list *recovery_conninfo, char *dest, bool as_file); static bool create_recovery_file(t_node_info *node_record, t_conninfo_param_list *primary_conninfo, char *dest, bool as_file);
static void write_primary_conninfo(PQExpBufferData *dest, t_conninfo_param_list *param_list); static void write_primary_conninfo(PQExpBufferData *dest, t_conninfo_param_list *param_list);
static bool check_sibling_nodes(NodeInfoList *sibling_nodes, SiblingNodeStats *sibling_nodes_stats); static bool check_sibling_nodes(NodeInfoList *sibling_nodes, SiblingNodeStats *sibling_nodes_stats);
static bool check_free_wal_senders(int available_wal_senders, SiblingNodeStats *sibling_nodes_stats, bool *dry_run_success); static bool check_free_wal_senders(int available_wal_senders, SiblingNodeStats *sibling_nodes_stats, bool *dry_run_success);
@@ -6942,11 +6942,11 @@ check_recovery_type(PGconn *conn)
* Creates a recovery.conf file for a standby * Creates a recovery.conf file for a standby
* *
* A database connection pointer is required for escaping primary_conninfo * A database connection pointer is required for escaping primary_conninfo
* parameters. When cloning from Barman and --no-upstream-connection ) this * parameters. When cloning from Barman and --no-upstream-connection supplied,
* might not be available. * this might not be available.
*/ */
bool static bool
create_recovery_file(t_node_info *node_record, t_conninfo_param_list *recovery_conninfo, char *dest, bool as_file) create_recovery_file(t_node_info *node_record, t_conninfo_param_list *primary_conninfo, char *dest, bool as_file)
{ {
PQExpBufferData recovery_file_buf; PQExpBufferData recovery_file_buf;
char recovery_file_path[MAXPGPATH] = ""; char recovery_file_path[MAXPGPATH] = "";
@@ -6961,29 +6961,7 @@ create_recovery_file(t_node_info *node_record, t_conninfo_param_list *recovery_c
"standby_mode = 'on'\n"); "standby_mode = 'on'\n");
/* primary_conninfo = '...' */ /* primary_conninfo = '...' */
write_primary_conninfo(&recovery_file_buf, primary_conninfo);
/*
* the user specified --upstream-conninfo string - copy that
*/
if (strlen(runtime_options.upstream_conninfo))
{
char *escaped = escape_recovery_conf_value(runtime_options.upstream_conninfo);
appendPQExpBuffer(&recovery_file_buf,
"primary_conninfo = '%s'\n",
escaped);
free(escaped);
}
/*
* otherwise use the conninfo inferred from the upstream connection and/or
* node record
*/
else
{
write_primary_conninfo(&recovery_file_buf, recovery_conninfo);
}
/* recovery_target_timeline = 'latest' */ /* recovery_target_timeline = 'latest' */
appendPQExpBufferStr(&recovery_file_buf, appendPQExpBufferStr(&recovery_file_buf,