github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-27 00: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

14
repmgr-action-standby.c
View File

@@ -1620,7 +1620,7 @@ do_standby_register(void)
else
{
/* check our standby is connected */
if (is_downstream_node_attached(upstream_conn, config_file_options.node_name) == true)
if (is_downstream_node_attached(upstream_conn, config_file_options.node_name) == NODE_ATTACHED)
{
log_verbose(LOG_INFO, _("local node is attached to specified upstream node %i"), runtime_options.upstream_node_id);
}
@@ -1679,7 +1679,7 @@ do_standby_register(void)
primary_node_id);
/* check our standby is connected */
if (is_downstream_node_attached(primary_conn, config_file_options.node_name) == true)
if (is_downstream_node_attached(primary_conn, config_file_options.node_name) == NODE_ATTACHED)
{
log_verbose(LOG_INFO, _("local node is attached to primary"));
}
@@ -2858,9 +2858,13 @@ do_standby_follow(void)
for (timer = 0; timer < config_file_options.standby_follow_timeout; timer++)
{
success = is_downstream_node_attached(follow_target_conn, config_file_options.node_name);
if (success == true)
NodeAttached node_attached = is_downstream_node_attached(follow_target_conn, config_file_options.node_name);
if (node_attached == NODE_ATTACHED)
{
success = true;
break;
}
log_verbose(LOG_DEBUG, "sleeping %i of max %i seconds waiting for standby to attach to primary",
timer + 1,
@@ -3411,7 +3415,7 @@ do_standby_switchover(void)
exit(ERR_BAD_CONFIG);
}
if (is_downstream_node_attached(remote_conn, local_node_record.node_name) == false)
if (is_downstream_node_attached(remote_conn, local_node_record.node_name) != NODE_ATTACHED)
{
log_error(_("local node \"%s\" (ID: %i) is not attached to demotion candidate \"%s\" (ID: %i)"),
local_node_record.node_name,