Commit 98632c4f authored by Stephen Shirley's avatar Stephen Shirley
Browse files

Don't remove master_candidate flag from merged nodes



Prevents lots of spurious warnings like:
2011-02-10 17:00:22,776: CRITICAL Configuration data is not consistent:
Not enough master candidates: actual 3, target 4
Signed-off-by: default avatarStephen Shirley <diamond@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent a536aaac
......@@ -273,7 +273,6 @@ class Merger(object):
for node in other_config.GetNodeList():
node_info = other_config.GetNodeInfo(node)
node_info.master_candidate = False
my_config.AddNode(node_info, _CLUSTERMERGE_ECID + str(fake_ec_id))
fake_ec_id += 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment