Commit d47319e2 authored by Guido Trotter's avatar Guido Trotter
Browse files

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: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent 3e22caed
......@@ -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:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment