From cb3861688de86ee22149104cdd322b168380c0a8 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 5 Aug 2011 13:10:53 +0200
Subject: [PATCH] LUGroupVerifyDisks: Use _CheckInstanceNodeGroups' result
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
β¦ instead of getting the list of instances once again from the
configuration.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cmdlib.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 592dbf344..e46d13fa9 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3028,12 +3028,14 @@ class LUGroupVerifyDisks(NoHooksLU):
# Check if node groups for locked instances are still correct
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), \
"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):
"""Verify integrity of cluster disks.
--
GitLab