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

"standby follow": ensure recovery.conf uses "node_name" as "application_name"

Browse Source 
In repmgr4 we want to make it easier to establish which node is connected
to which.
This commit is contained in:
Ian Barwick
2017-08-22 13:21:29 +09:00
parent 44d1b96bc3
commit ef0163bd84
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
repmgr-action-standby.c
View File

@@ -1425,7 +1425,6 @@ do_standby_follow_internal(PGconn *primary_conn, t_node_info *primary_node_recor
{ {
int primary_server_version_num = get_server_version(primary_conn, NULL); int primary_server_version_num = get_server_version(primary_conn, NULL);
if (create_replication_slot(primary_conn, if (create_replication_slot(primary_conn,
local_node_record.slot_name, local_node_record.slot_name,
primary_server_version_num, primary_server_version_num,
@@ -1443,13 +1442,6 @@ do_standby_follow_internal(PGconn *primary_conn, t_node_info *primary_node_recor
/* We ignore any application_name set in the primary's conninfo */ /* We ignore any application_name set in the primary's conninfo */
parse_conninfo_string(primary_node_record->conninfo, &recovery_conninfo, errmsg, true); parse_conninfo_string(primary_node_record->conninfo, &recovery_conninfo, errmsg, true);
/* Set the default application name to this node's name */
param_set(&recovery_conninfo, "application_name", config_file_options.node_name);
/* Set the replication user from the primary node record */
param_set(&recovery_conninfo, "user", primary_node_record->repluser);
{ {
t_conninfo_param_list local_node_conninfo; t_conninfo_param_list local_node_conninfo;
bool parse_success; bool parse_success;
@@ -1488,6 +1480,13 @@ do_standby_follow_internal(PGconn *primary_conn, t_node_info *primary_node_recor
free_conninfo_params(&local_node_conninfo); free_conninfo_params(&local_node_conninfo);
} }
/* Set the application name to this node's name */
param_set(&recovery_conninfo, "application_name", config_file_options.node_name);
/* Set the replication user from the primary node record */
param_set(&recovery_conninfo, "user", primary_node_record->repluser);
log_info(_("changing node %i's primary to node %i"), log_info(_("changing node %i's primary to node %i"),
config_file_options.node_id, primary_node_record->node_id); config_file_options.node_id, primary_node_record->node_id);