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

Remove pointless check

Browse Source 
Witness server can never be considered as a promotion candidate.
This commit is contained in:
Ian Barwick
2015-01-13 14:23:01 +09:00
parent 242fc8416c
commit 9cbac64ad4
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
repmgrd.c
View File

@@ -1119,7 +1119,7 @@ do_failover(void)
*/ */
for (i = 0; i < total_nodes; i++) for (i = 0; i < total_nodes; i++)
{ {
/* witness is never a good candidate */ /* witness server can never be a candidate */
if (nodes[i].is_witness) if (nodes[i].is_witness)
continue; continue;
@@ -1135,7 +1135,6 @@ do_failover(void)
best_candidate.node_id = nodes[i].node_id; best_candidate.node_id = nodes[i].node_id;
best_candidate.xlog_location = nodes[i].xlog_location; best_candidate.xlog_location = nodes[i].xlog_location;
best_candidate.is_ready = nodes[i].is_ready; best_candidate.is_ready = nodes[i].is_ready;
best_candidate.is_witness = nodes[i].is_witness;
candidate_found = true; candidate_found = true;
} }
@@ -1149,7 +1148,6 @@ do_failover(void)
best_candidate.node_id = nodes[i].node_id; best_candidate.node_id = nodes[i].node_id;
best_candidate.xlog_location = nodes[i].xlog_location; best_candidate.xlog_location = nodes[i].xlog_location;
best_candidate.is_ready = nodes[i].is_ready; best_candidate.is_ready = nodes[i].is_ready;
best_candidate.is_witness = nodes[i].is_witness;
} }
} }
@@ -1164,17 +1162,6 @@ do_failover(void)
/* once we know who is the best candidate, promote it */ /* once we know who is the best candidate, promote it */
if (best_candidate.node_id == local_options.node) if (best_candidate.node_id == local_options.node)
{ {
// ZZZ from loop above this should never happen anyway???
// in fact do_failover is never called if rempgrd is running on a witness,
// as it's only called by standby_monitor()
if (best_candidate.is_witness)
{
log_err(_("%s: Node selected as new master is a witness. Can't be promoted.\n"),
progname);
terminate(ERR_FAILOVER_FAIL);
}
/* wait */ /* wait */
sleep(5); sleep(5);