From f0ca837fc32fc12b638b6d2f4320c08a4b34d5a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Mon, 20 Sep 2010 14:53:57 +0200
Subject: [PATCH] Ignore failures while shutting down instances during failover
from offline node
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Don't abort failover if instance shutdown doesn't work on a node marked
offline. The node is offline, so the instances living on it are too. Before
you had to use --ignore-consistency to archieve that.
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/cmdlib.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 7fab90437..1ed93f205 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -5442,6 +5442,7 @@ class LUFailoverInstance(LogicalUnit):
"""
instance = self.instance
+ primary_node = self.cfg.GetNodeInfo(instance.primary_node)
source_node = instance.primary_node
target_node = instance.secondary_nodes[0]
@@ -5465,7 +5466,7 @@ class LUFailoverInstance(LogicalUnit):
self.op.shutdown_timeout)
msg = result.fail_msg
if msg:
- if self.op.ignore_consistency:
+ if self.op.ignore_consistency or primary_node.offline:
self.proc.LogWarning("Could not shutdown instance %s on node %s."
" Proceeding anyway. Please make sure node"
" %s is down. Error details: %s",
--
GitLab