diff --git a/lib/cmdlib.py b/lib/cmdlib.py index 9ba3dcc0ec006dfb91b19dad75ce4e30f03cb6bb..7d44580983d75394172a096be92592e6a448d6c1 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