From d47319e2fc3c1f6065b72ca5113cc6a2f1f706ba Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Fri, 19 Aug 2011 12:21:59 +0100
Subject: [PATCH] Transform node readd exceptions into just errors
We are after the point of no return, no point in failing everything
because a node failed to readd. Better to just report it and move on.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
tools/cluster-merge | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/cluster-merge b/tools/cluster-merge
index d2c72cf69..cff79dda7 100755
--- a/tools/cluster-merge
+++ b/tools/cluster-merge
@@ -589,9 +589,8 @@ class Merger(object):
result = utils.RunCmd(["gnt-node", "add", "--readd",
"--no-ssh-key-check", "--force-join", node])
if result.failed:
- raise errors.CommandError("Couldn't readd node %s. Fail reason: %s;"
- " output: %s" % (node, result.fail_reason,
- result.output))
+ logging.error("%s failed to be readded. Reason: %s, output: %s",
+ node, result.fail_reason, result.output)
result = utils.RunCmd(["gnt-cluster", "redist-conf"])
if result.failed:
--
GitLab