From 3cb5c1e3b53a50c54ea5e602e88d4f17214115c9 Mon Sep 17 00:00:00 2001
From: Luca Bigliardi <shammash@google.com>
Date: Tue, 25 Aug 2009 15:15:58 +0100
Subject: [PATCH] LURemoveNode: no logs running post on removed node
Do not log results from hooks ran on the removed node as now it's done by
RunPhase.
Signed-off-by: Luca Bigliardi <shammash@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/cmdlib.py | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 9ba3dcc0e..7d4458098 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2203,21 +2203,8 @@ class LURemoveNode(LogicalUnit):
hm = self.proc.hmclass(self.rpc.call_hooks_runner, self)
try:
h_results = hm.RunPhase(constants.HOOKS_PHASE_POST, [node.name])
- finally:
- res = h_results[node.name]
- if res.fail_msg:
- if not res.offline:
- self.LogError("Failed to start hooks on %s: %s" %
- (node.name, res.fail_msg))
- for script, hkr, output in res.payload:
- if hkr != constants.HKR_FAIL:
- continue
- if output:
- self.LogWarning("On %s script %s failed, output: %s" %
- (node.name, script, output))
- else:
- self.LogWarning("On %s script %s failed (no output)." %
- (node.name, script))
+ except:
+ self.LogWarning("Errors occurred running hooks on %s" % node.name)
result = self.rpc.call_node_leave_cluster(node.name)
msg = result.fail_msg
--
GitLab