From 1df79ce6ed217b254e8cbdf3a9363e5607547e9f Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 29 Oct 2009 17:06:13 +0100
Subject: [PATCH] Don't show warnings on ADMIN_down instance failover
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Before:
$ gnt-instance failover -f inst1
β¦ checking disk consistency between source and target
β¦ - WARNING: Can't find disk on node node21.example.com
β¦ shutting down instance on source node
After:
$ gnt-instance failover -f inst1
β¦ not checking disk consistency as instance is not running
β¦ shutting down instance on source node
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/cmdlib.py | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index fb8ff8da3..1b1c37f1d 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -4470,13 +4470,16 @@ class LUFailoverInstance(LogicalUnit):
source_node = instance.primary_node
target_node = instance.secondary_nodes[0]
- feedback_fn("* checking disk consistency between source and target")
- for dev in instance.disks:
- # for drbd, these are drbd over lvm
- if not _CheckDiskConsistency(self, dev, target_node, False):
- if instance.admin_up and not self.op.ignore_consistency:
- raise errors.OpExecError("Disk %s is degraded on target node,"
- " aborting failover." % dev.iv_name)
+ if instance.admin_up:
+ feedback_fn("* checking disk consistency between source and target")
+ for dev in instance.disks:
+ # for drbd, these are drbd over lvm
+ if not _CheckDiskConsistency(self, dev, target_node, False):
+ if not self.op.ignore_consistency:
+ raise errors.OpExecError("Disk %s is degraded on target node,"
+ " aborting failover." % dev.iv_name)
+ else:
+ feedback_fn("* not checking disk consistency as instance is not running")
feedback_fn("* shutting down instance on source node")
logging.info("Shutting down instance %s on node %s",
--
GitLab