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

repmgrd: always emit NOTICE when attempting to follow a new primary

Browse Source 
Previously, if a standby's repmgrd was looping in degraded monitoring
mode looking for a new primary to follow, once a new primary was
detected the follow command would be executed without any prior
logging at non-DEBUG log levels.
This commit is contained in:
Ian Barwick
2019-08-26 15:43:44 +09:00
parent ffc7b7817b
commit 3e812f6e91
1 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
repmgrd-physical.c
View File

@@ -1710,9 +1710,6 @@ monitor_streaming_standby(void)
* has been promoted * has been promoted
*/ */
NodeInfoListCell *cell;
int follow_node_id = UNKNOWN_NODE_ID;
/* local node has been promoted */ /* local node has been promoted */
if (get_recovery_type(local_conn) == RECTYPE_PRIMARY) if (get_recovery_type(local_conn) == RECTYPE_PRIMARY)
{ {
@@ -1802,6 +1799,9 @@ monitor_streaming_standby(void)
if (sibling_nodes.node_count > 0) if (sibling_nodes.node_count > 0)
{ {
NodeInfoListCell *cell;
t_node_info *follow_node_info = NULL;
log_debug("scanning %i node records to detect new primary...", sibling_nodes.node_count); log_debug("scanning %i node records to detect new primary...", sibling_nodes.node_count);
for (cell = sibling_nodes.head; cell; cell = cell->next) for (cell = sibling_nodes.head; cell; cell = cell->next)
{ {
@@ -1828,16 +1828,19 @@ monitor_streaming_standby(void)
if (get_recovery_type(cell->node_info->conn) == RECTYPE_PRIMARY) if (get_recovery_type(cell->node_info->conn) == RECTYPE_PRIMARY)
{ {
follow_node_id = cell->node_info->node_id; follow_node_info = cell->node_info;
close_connection(&cell->node_info->conn); close_connection(&cell->node_info->conn);
break; break;
} }
close_connection(&cell->node_info->conn); close_connection(&cell->node_info->conn);
} }
if (follow_node_id != UNKNOWN_NODE_ID) if (follow_node_info != NULL)
{ {
follow_new_primary(follow_node_id); log_info(_("node \"%s\" (node ID: %i) detected as primary"),
follow_node_info->node_name,
follow_node_info->node_id);
follow_new_primary(follow_node_info->node_id);
} }
} }
@@ -2380,8 +2383,6 @@ monitor_streaming_witness(void)
* has been promoted * has been promoted
*/ */
NodeInfoListCell *cell;
int follow_node_id = UNKNOWN_NODE_ID;
NodeInfoList sibling_nodes = T_NODE_INFO_LIST_INITIALIZER; NodeInfoList sibling_nodes = T_NODE_INFO_LIST_INITIALIZER;
get_active_sibling_node_records(local_conn, get_active_sibling_node_records(local_conn,
@@ -2391,6 +2392,9 @@ monitor_streaming_witness(void)
if (sibling_nodes.node_count > 0) if (sibling_nodes.node_count > 0)
{ {
NodeInfoListCell *cell;
t_node_info *follow_node_info = NULL;
log_debug("scanning %i node records to detect new primary...", sibling_nodes.node_count); log_debug("scanning %i node records to detect new primary...", sibling_nodes.node_count);
for (cell = sibling_nodes.head; cell; cell = cell->next) for (cell = sibling_nodes.head; cell; cell = cell->next)
{ {
@@ -2416,18 +2420,22 @@ monitor_streaming_witness(void)
if (get_recovery_type(cell->node_info->conn) == RECTYPE_PRIMARY) if (get_recovery_type(cell->node_info->conn) == RECTYPE_PRIMARY)
{ {
follow_node_id = cell->node_info->node_id; follow_node_info = cell->node_info;
close_connection(&cell->node_info->conn); close_connection(&cell->node_info->conn);
break; break;
} }
close_connection(&cell->node_info->conn); close_connection(&cell->node_info->conn);
} }
if (follow_node_id != UNKNOWN_NODE_ID) if (follow_node_info != NULL)
{ {
witness_follow_new_primary(follow_node_id); log_info(_("node \"%s\" (node ID: %i) detected as primary"),
follow_node_info->node_name,
follow_node_info->node_id);
witness_follow_new_primary(follow_node_info->node_id);
} }
} }
clear_node_info_list(&sibling_nodes); clear_node_info_list(&sibling_nodes);
} }
} }
@@ -3594,6 +3602,10 @@ follow_new_primary(int new_primary_id)
return FAILOVER_STATE_FOLLOW_FAIL; return FAILOVER_STATE_FOLLOW_FAIL;
} }
log_notice(_("attempting to follow new primary \"%s\" (node ID: %i)"),
new_primary.node_name,
new_primary_id);
record_status = get_node_record(local_conn, local_node_info.upstream_node_id, &failed_primary); record_status = get_node_record(local_conn, local_node_info.upstream_node_id, &failed_primary);
if (record_status != RECORD_FOUND) if (record_status != RECORD_FOUND)