From f19267566bdd3fe68a59fc93c1fcf78da8653ca2 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Fri, 15 May 2009 09:42:55 +0100
Subject: [PATCH] Don't check memory at startup if instance is up
Signed-off-by: Guido Trotter <ultrotter@google.com>
---
lib/cmdlib.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 9075fd5f9..2cdf48f4f 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2767,9 +2767,14 @@ class LUStartupInstance(LogicalUnit):
# check bridges existance
_CheckInstanceBridgesExist(self, instance)
- _CheckNodeFreeMemory(self, instance.primary_node,
- "starting instance %s" % instance.name,
- bep[constants.BE_MEMORY], instance.hypervisor)
+ remote_info = self.rpc.call_instance_info(instance.primary_node,
+ instance.name,
+ instance.hypervisor)
+ remote_info.Raise()
+ if not remote_info.data:
+ _CheckNodeFreeMemory(self, instance.primary_node,
+ "starting instance %s" % instance.name,
+ bep[constants.BE_MEMORY], instance.hypervisor)
def Exec(self, feedback_fn):
"""Start the instance.
--
GitLab