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

repmgr: don't count witness node as a standby when running "node check"

Browse Source 
Addresses GitHub #451.
This commit is contained in:
Ian Barwick
2018-06-21 11:13:46 +09:00
parent 836d2125fe
commit b0ed87832b
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
repmgr-action-node.c
View File

@@ -1343,6 +1343,7 @@ do_node_check_downstream(PGconn *conn, OutputMode mode, CheckStatusList *list_ou
NodeInfoList downstream_nodes = T_NODE_INFO_LIST_INITIALIZER; NodeInfoList downstream_nodes = T_NODE_INFO_LIST_INITIALIZER;
NodeInfoListCell *cell = NULL; NodeInfoListCell *cell = NULL;
int missing_nodes_count = 0; int missing_nodes_count = 0;
int expected_nodes_count = 0;
CheckStatus status = CHECK_STATUS_OK; CheckStatus status = CHECK_STATUS_OK;
ItemList missing_nodes = {NULL, NULL}; ItemList missing_nodes = {NULL, NULL};
ItemList attached_nodes = {NULL, NULL}; ItemList attached_nodes = {NULL, NULL};
@@ -1352,8 +1353,17 @@ do_node_check_downstream(PGconn *conn, OutputMode mode, CheckStatusList *list_ou
get_downstream_node_records(conn, config_file_options.node_id, &downstream_nodes); get_downstream_node_records(conn, config_file_options.node_id, &downstream_nodes);
/* if a witness node is present, we'll need to remove this from the total */
expected_nodes_count = downstream_nodes.node_count;
for (cell = downstream_nodes.head; cell; cell = cell->next) for (cell = downstream_nodes.head; cell; cell = cell->next)
{ {
if (cell->node_info->type == WITNESS)
{
expected_nodes_count --;
continue;
}
if (is_downstream_node_attached(conn, cell->node_info->node_name) == false) if (is_downstream_node_attached(conn, cell->node_info->node_name) == false)
{ {
missing_nodes_count++; missing_nodes_count++;
@@ -1373,7 +1383,7 @@ do_node_check_downstream(PGconn *conn, OutputMode mode, CheckStatusList *list_ou
if (missing_nodes_count == 0) if (missing_nodes_count == 0)
{ {
if (downstream_nodes.node_count == 0) if (expected_nodes_count == 0)
appendPQExpBuffer( appendPQExpBuffer(
&details, &details,
"this node has no downstream nodes"); "this node has no downstream nodes");
@@ -1381,8 +1391,8 @@ do_node_check_downstream(PGconn *conn, OutputMode mode, CheckStatusList *list_ou
appendPQExpBuffer( appendPQExpBuffer(
&details, &details,
"%i of %i downstream nodes attached", "%i of %i downstream nodes attached",
downstream_nodes.node_count, expected_nodes_count - missing_nodes_count,
downstream_nodes.node_count); expected_nodes_count);
} }
else else
{ {
@@ -1391,22 +1401,19 @@ do_node_check_downstream(PGconn *conn, OutputMode mode, CheckStatusList *list_ou
status = CHECK_STATUS_CRITICAL; status = CHECK_STATUS_CRITICAL;
appendPQExpBuffer( appendPQExpBuffer(&details,
&details,
"%i of %i downstream nodes not attached", "%i of %i downstream nodes not attached",
missing_nodes_count, missing_nodes_count,
downstream_nodes.node_count); expected_nodes_count);
if (mode != OM_NAGIOS) if (mode != OM_NAGIOS)
{ {
appendPQExpBuffer( appendPQExpBuffer(&details, "; missing: ");
&details, "; missing: ");
for (missing_cell = missing_nodes.head; missing_cell; missing_cell = missing_cell->next) for (missing_cell = missing_nodes.head; missing_cell; missing_cell = missing_cell->next)
{ {
if (first == false) if (first == false)
appendPQExpBuffer( appendPQExpBuffer(&details,
&details,
", "); ", ");
else else
first = false; first = false;
@@ -1445,7 +1452,7 @@ do_node_check_downstream(PGconn *conn, OutputMode mode, CheckStatusList *list_ou
} }
} }
if (downstream_nodes.node_count - missing_nodes_count) if (expected_nodes_count - missing_nodes_count)
{ {
ItemListCell *attached_cell = NULL; ItemListCell *attached_cell = NULL;
bool first = true; bool first = true;