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

Change return type of is_downstream_node_attached() from bool to NodeAttached

Browse Source 
This enables us to better determine whether a node is definitively
attached, definitively not attached, or if it was not possible to
determine the attached state.
This commit is contained in:
Ian Barwick
2019-05-14 15:53:46 +09:00
parent 7599afce8b
commit dd78a16006
4 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
repmgr-action-node.c
View File

@@ -294,7 +294,7 @@ do_node_status(void)
continue;
}
if (is_downstream_node_attached(conn, node_cell->node_info->node_name) == false)
if (is_downstream_node_attached(conn, node_cell->node_info->node_name) != NODE_ATTACHED)
{
missing_nodes_count++;
item_list_append_format(&missing_nodes,
@@ -1166,7 +1166,7 @@ do_node_check_downstream(PGconn *conn, OutputMode mode, CheckStatusList *list_ou
continue;
}
if (is_downstream_node_attached(conn, cell->node_info->node_name) == false)
if (is_downstream_node_attached(conn, cell->node_info->node_name) != NODE_ATTACHED)
{
missing_nodes_count++;
item_list_append_format(&missing_nodes,
@@ -2562,9 +2562,10 @@ do_node_rejoin(void)
for (; i < config_file_options.node_rejoin_timeout; i++)
{
success = is_downstream_node_attached(primary_conn, config_file_options.node_name);
NodeStatus node_attached = is_downstream_node_attached(primary_conn,
config_file_options.node_name);
if (success == true)
if (node_attached == NODE_ATTACHED)
{
log_verbose(LOG_INFO, _("node %i has attached to its upstream node"),
config_file_options.node_id);
@@ -2612,7 +2613,9 @@ do_node_rejoin(void)
else
{
/* -W/--no-wait provided - check once */
success = is_downstream_node_attached(primary_conn, config_file_options.node_name);
NodeStatus node_attached = is_downstream_node_attached(primary_conn, config_file_options.node_name);
if (node_attached == NODE_ATTACHED)
success = true;
}
/*