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

Improve logging and event notifications when following new upstream node

Browse Source
This commit is contained in:
Ian Barwick
2015-10-23 09:36:42 +09:00
committed by Ian Barwick
parent 0c5025b3d6
commit a59ea243c0
1 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
repmgrd.c
View File

@@ -1531,7 +1531,6 @@ do_master_failover(void)
* table but we should be able to generate an external notification * table but we should be able to generate an external notification
* if required. * if required.
*/ */
create_event_record(NULL, create_event_record(NULL,
&local_options, &local_options,
node_info.node_id, node_info.node_id,
@@ -1610,6 +1609,7 @@ do_upstream_standby_failover(t_node_info upstream_node)
char sqlquery[QUERY_STR_LEN]; char sqlquery[QUERY_STR_LEN];
int upstream_node_id = node_info.upstream_node_id; int upstream_node_id = node_info.upstream_node_id;
int r; int r;
PQExpBufferData event_details;
log_debug(_("do_upstream_standby_failover(): performing failover for node %i\n"), log_debug(_("do_upstream_standby_failover(): performing failover for node %i\n"),
node_info.node_id); node_info.node_id);
@@ -1686,19 +1686,58 @@ do_upstream_standby_failover(t_node_info upstream_node)
PQfinish(my_local_conn); PQfinish(my_local_conn);
my_local_conn = NULL; my_local_conn = NULL;
initPQExpBuffer(&event_details);
/* Follow new upstream */ /* Follow new upstream */
r = system(local_options.follow_command); r = system(local_options.follow_command);
if (r != 0) if (r != 0)
{ {
log_err(_("follow command failed. You could check and try it manually.\n")); appendPQExpBuffer(&event_details,
_("Unable to execute follow command:\n %s"),
local_options.follow_command);
log_err("%s\n", event_details.data);
/* It won't be possible to write to the event notification
* table but we should be able to generate an external notification
* if required.
*/
create_event_record(NULL,
&local_options,
node_info.node_id,
"repmgrd_failover_follow",
false,
event_details.data);
terminate(ERR_BAD_CONFIG); terminate(ERR_BAD_CONFIG);
} }
if (update_node_record_set_upstream(master_conn, local_options.cluster_name, node_info.node_id, upstream_node_id) == false) if (update_node_record_set_upstream(master_conn, local_options.cluster_name, node_info.node_id, upstream_node_id) == false)
{ {
appendPQExpBuffer(&event_details,
_("Unable to set node %i's new upstream ID to %i"),
node_info.node_id,
upstream_node_id);
create_event_record(NULL,
&local_options,
node_info.node_id,
"repmgrd_failover_follow",
false,
event_details.data);
terminate(ERR_BAD_CONFIG); terminate(ERR_BAD_CONFIG);
} }
appendPQExpBuffer(&event_details,
_("Node %i is now following upstream node %i"),
node_info.node_id,
upstream_node_id);
create_event_record(NULL,
&local_options,
node_info.node_id,
"repmgrd_failover_follow",
true,
event_details.data);
my_local_conn = establish_db_connection(local_options.conninfo, true); my_local_conn = establish_db_connection(local_options.conninfo, true);
return true; return true;