Commit a536aaac authored by Stephen Shirley's avatar Stephen Shirley
Browse files

Use a consistent ECID base



ECID was being calculated completely differently in
__MergeNodeGroups() and _MergeConfig()
Signed-off-by: default avatarStephen Shirley <diamond@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent b74c0684
......@@ -274,7 +274,7 @@ 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, str(fake_ec_id))
my_config.AddNode(node_info, _CLUSTERMERGE_ECID + str(fake_ec_id))
fake_ec_id += 1
for instance in other_config.GetInstanceList():
......@@ -294,7 +294,8 @@ class Merger(object):
physical_id[1] = physical_id[3] = port
dsk.physical_id = tuple(physical_id)
my_config.AddInstance(instance_info, str(fake_ec_id))
my_config.AddInstance(instance_info,
_CLUSTERMERGE_ECID + str(fake_ec_id))
fake_ec_id += 1
# R0201: Method could be a function
......
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