Ensure witness repmgrd detects change in upstream's role

This ensures that e.g. after a switchover, repmgrd running on a witness
node will automatically detect the new primary and monitor that.
This commit is contained in:
Ian Barwick
2018-10-18 16:13:01 +09:00
parent 3907a545b0
commit c79852cce0

View File

@@ -1299,12 +1299,13 @@ monitor_streaming_witness(void)
log_warning(_("unable to retrieve node record from primary")); log_warning(_("unable to retrieve node record from primary"));
} }
/* Log startup event */
if (startup_event_logged == false)
{ {
PQExpBufferData event_details; PQExpBufferData event_details;
char *event_type = startup_event_logged == false
? "repmgrd_start"
: "repmgrd_upstream_reconnect";
initPQExpBuffer(&event_details); initPQExpBuffer(&event_details);
appendPQExpBuffer(&event_details, appendPQExpBuffer(&event_details,
@@ -1312,16 +1313,17 @@ monitor_streaming_witness(void)
upstream_node_info.node_name, upstream_node_info.node_name,
upstream_node_info.node_id); upstream_node_info.node_id);
log_info("%s", event_details.data);
create_event_notification(primary_conn, create_event_notification(primary_conn,
&config_file_options, &config_file_options,
config_file_options.node_id, config_file_options.node_id,
"repmgrd_start", event_type,
true, true,
event_details.data); event_details.data);
startup_event_logged = true; if (startup_event_logged == false)
startup_event_logged = true;
log_info("%s", event_details.data);
termPQExpBuffer(&event_details); termPQExpBuffer(&event_details);
} }
@@ -1371,6 +1373,17 @@ monitor_streaming_witness(void)
upstream_node_unreachable_elapsed); upstream_node_unreachable_elapsed);
log_notice("%s", event_details.data); log_notice("%s", event_details.data);
/* check upstream is still primary */
if (get_recovery_type(primary_conn) != RECTYPE_PRIMARY)
{
log_notice(_("current upstream node \"%s\" (node ID: %i) is not primary, restarting monitoring"),
upstream_node_info.node_name, upstream_node_info.node_id);
PQfinish(primary_conn);
primary_conn = NULL;
termPQExpBuffer(&event_details);
return;
}
create_event_notification(primary_conn, create_event_notification(primary_conn,
&config_file_options, &config_file_options,
config_file_options.node_id, config_file_options.node_id,
@@ -1428,14 +1441,25 @@ monitor_streaming_witness(void)
upstream_node_info.node_id, upstream_node_info.node_id,
degraded_monitoring_elapsed); degraded_monitoring_elapsed);
log_notice("%s", event_details.data);
/* check upstream is still primary */
if (get_recovery_type(primary_conn) != RECTYPE_PRIMARY)
{
log_notice(_("current upstream node \"%s\" (node ID: %i) is not primary, restarting monitoring"),
upstream_node_info.node_name, upstream_node_info.node_id);
PQfinish(primary_conn);
primary_conn = NULL;
termPQExpBuffer(&event_details);
return;
}
create_event_notification(primary_conn, create_event_notification(primary_conn,
&config_file_options, &config_file_options,
config_file_options.node_id, config_file_options.node_id,
"repmgrd_upstream_reconnect", "repmgrd_upstream_reconnect",
true, true,
event_details.data); event_details.data);
log_notice("%s", event_details.data);
termPQExpBuffer(&event_details); termPQExpBuffer(&event_details);
goto loop; goto loop;