From bd631b02d0a96ac178f8703b77d0ffc9b0f9daa7 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Tue, 12 Oct 2010 16:54:14 +0200
Subject: [PATCH] Show instance state in instance console failures
The current message is not entirely clear, as it doesn't show the reason
why the instance is not running.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/cmdlib.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index d508fe17e..dba7038ec 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -7523,7 +7523,12 @@ class LUConnectConsole(NoHooksLU):
node_insts.Raise("Can't get node information from %s" % node)
if instance.name not in node_insts.payload:
- raise errors.OpExecError("Instance %s is not running." % instance.name)
+ if instance.admin_up:
+ state = "ERROR_down"
+ else:
+ state = "ADMIN_down"
+ raise errors.OpExecError("Instance %s is not running (state %s)" %
+ (instance.name, state))
logging.debug("Connecting to console of %s on %s", instance.name, node)
--
GitLab