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

repmgrd: fix witness node disconnection monitoring

Browse Source
This commit is contained in:
Ian Barwick
2019-05-30 11:51:50 +09:00
parent 9a0994856a
commit a6ea1d0fda
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
repmgrd-physical.c
View File

@@ -116,7 +116,7 @@ static const char *format_failover_state(FailoverState failover_state);
static ElectionResult execute_failover_validation_command(t_node_info *node_info); static ElectionResult execute_failover_validation_command(t_node_info *node_info);
static void parse_failover_validation_command(const char *template, t_node_info *node_info, PQExpBufferData *out); static void parse_failover_validation_command(const char *template, t_node_info *node_info, PQExpBufferData *out);
static bool check_node_can_follow(PGconn *local_conn, XLogRecPtr local_xlogpos, PGconn *follow_target_conn, t_node_info *follow_target_node_info); static bool check_node_can_follow(PGconn *local_conn, XLogRecPtr local_xlogpos, PGconn *follow_target_conn, t_node_info *follow_target_node_info);
static void check_witness_attached(t_node_info *node_info); static void check_witness_attached(t_node_info *node_info, bool startup);
static t_child_node_info *append_child_node_record(t_child_node_info_list *nodes, int node_id, const char *node_name, NodeAttached attached); static t_child_node_info *append_child_node_record(t_child_node_info_list *nodes, int node_id, const char *node_name, NodeAttached attached);
static void remove_child_node_record(t_child_node_info_list *nodes, int node_id); static void remove_child_node_record(t_child_node_info_list *nodes, int node_id);
@@ -339,7 +339,7 @@ monitor_streaming_primary(void)
*/ */
if (cell->node_info->type == WITNESS) if (cell->node_info->type == WITNESS)
{ {
check_witness_attached(cell->node_info); check_witness_attached(cell->node_info, true);
} }
if (cell->node_info->attached == NODE_ATTACHED) if (cell->node_info->attached == NODE_ATTACHED)
@@ -824,7 +824,7 @@ check_primary_child_nodes(t_child_node_info_list *local_child_nodes)
*/ */
if (cell->node_info->type == WITNESS) if (cell->node_info->type == WITNESS)
{ {
check_witness_attached(cell->node_info); check_witness_attached(cell->node_info, false);
} }
log_debug("child node: %i; attached: %s", log_debug("child node: %i; attached: %s",
@@ -4903,7 +4903,7 @@ check_node_can_follow(PGconn *local_conn, XLogRecPtr local_xlogpos, PGconn *foll
static void static void
check_witness_attached(t_node_info *node_info) check_witness_attached(t_node_info *node_info, bool startup)
{ {
/* /*
* connect and check upstream node id; at this point we don't care if it's * connect and check upstream node id; at this point we don't care if it's
@@ -4923,6 +4923,14 @@ check_witness_attached(t_node_info *node_info)
{ {
node_info->attached = NODE_ATTACHED; node_info->attached = NODE_ATTACHED;
} }
else
{
node_info->attached = NODE_DETACHED;
}
}
else
{
node_info->attached = startup == true ? NODE_ATTACHED_UNKNOWN : NODE_DETACHED;
} }
PQfinish(witness_conn); PQfinish(witness_conn);