Commit cb386168 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

LUGroupVerifyDisks: Use _CheckInstanceNodeGroups' result



… instead of getting the list of instances once again from the
configuration.
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent b9ff3e15
...@@ -3028,12 +3028,14 @@ class LUGroupVerifyDisks(NoHooksLU): ...@@ -3028,12 +3028,14 @@ class LUGroupVerifyDisks(NoHooksLU):
# Check if node groups for locked instances are still correct # Check if node groups for locked instances are still correct
for (instance_name, inst) in self.instances.items(): for (instance_name, inst) in self.instances.items():
assert self.group_uuid in self.cfg.GetInstanceNodeGroups(instance_name), \
"Instance %s has no node in group %s" % (instance_name, self.group_uuid)
assert owned_nodes.issuperset(inst.all_nodes), \ assert owned_nodes.issuperset(inst.all_nodes), \
"Instance %s's nodes changed while we kept the lock" % instance_name "Instance %s's nodes changed while we kept the lock" % instance_name
_CheckInstanceNodeGroups(self.cfg, instance_name, owned_groups) inst_groups = _CheckInstanceNodeGroups(self.cfg, instance_name,
owned_groups)
assert self.group_uuid in inst_groups, \
"Instance %s has no node in group %s" % (instance_name, self.group_uuid)
def Exec(self, feedback_fn): def Exec(self, feedback_fn):
"""Verify integrity of cluster disks. """Verify integrity of cluster disks.
......
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