From b4874c9e029c629e255f3f37d5409922b8bd9a3c Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Fri, 15 May 2009 09:44:13 +0100
Subject: [PATCH] Instance reinstall: don't mix up errors
If the remote info rpc call fails we can't assume that the instance is
up.
Signed-off-by: Guido Trotter <ultrotter@google.com>
---
lib/cmdlib.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 2cdf48f4f..9c4a994de 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2971,7 +2971,8 @@ class LUReinstallInstance(LogicalUnit):
remote_info = self.rpc.call_instance_info(instance.primary_node,
instance.name,
instance.hypervisor)
- if remote_info.failed or remote_info.data:
+ remote_info.Raise()
+ if remote_info.data:
raise errors.OpPrereqError("Instance '%s' is running on the node %s" %
(self.op.instance_name,
instance.primary_node))
--
GitLab