From c5705f58fdf70183d097d8fcdd2fffcd3dd7fa20 Mon Sep 17 00:00:00 2001 From: Guido Trotter <ultrotter@google.com> Date: Thu, 10 Apr 2008 10:18:33 +0000 Subject: [PATCH] Verify: instance verification cleanup The instance configuration is grabbed both in the _VerifyInstance function and in the loop that calls it. Clean this up by passing the configuration as a parameter. Reviewed-by: imsnah --- lib/cmdlib.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/cmdlib.py b/lib/cmdlib.py index 543519013..07f34e621 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -675,7 +675,8 @@ class LUVerifyCluster(NoHooksLU): feedback_fn(" - ERROR: hypervisor verify failure: '%s'" % hyp_result) return bad - def _VerifyInstance(self, instance, node_vol_is, node_instance, feedback_fn): + def _VerifyInstance(self, instance, instanceconfig, node_vol_is, + node_instance, feedback_fn): """Verify an instance. This function checks to see if the required block devices are @@ -690,7 +691,6 @@ class LUVerifyCluster(NoHooksLU): (instance, instancelist)) bad = True - instanceconfig = self.cfg.GetInstanceInfo(instance) node_current = instanceconfig.primary_node node_vol_should = {} @@ -828,11 +828,10 @@ class LUVerifyCluster(NoHooksLU): for instance in instancelist: feedback_fn("* Verifying instance %s" % instance) - result = self._VerifyInstance(instance, node_volume, node_instance, - feedback_fn) - bad = bad or result - inst_config = self.cfg.GetInstanceInfo(instance) + result = self._VerifyInstance(instance, inst_config, node_volume, + node_instance, feedback_fn) + bad = bad or result inst_config.MapLVsByNode(node_vol_should) -- GitLab