From e9f7d26ae316e1e1753b2fbc9f40d7c03195932a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Mon, 28 Mar 2011 10:50:08 +0200
Subject: [PATCH] Relax instance ERROR on admin_down on offline node
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This fixes a issue, where an stopped instances is reported as ERROR
in cluster verify if it lives on a offline node. As the instances is
down this shouldn't happen.
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cmdlib.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index a35a54b56..d663f8d03 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2360,8 +2360,10 @@ class LUClusterVerify(LogicalUnit):
self.ENODERPC, pnode, "instance %s, connection to"
" primary node failed", instance)
- _ErrorIf(pnode_img.offline, self.EINSTANCEBADNODE, instance,
- "instance lives on offline node %s", inst_config.primary_node)
+ _ErrorIf(inst_config.admin_up and pnode_img.offline,
+ self.EINSTANCEBADNODE, instance,
+ "instance is marked as running and lives on offline node %s",
+ inst_config.primary_node)
# If the instance is non-redundant we cannot survive losing its primary
# node, so we are not N+1 compliant. On the other hand we have no disk
--
GitLab