Commit 73e6cf8d authored by Andrea Spadaccini's avatar Andrea Spadaccini
Browse files

Fix cluster destroy failure



Cluster destroy would fail if there were errors while deactivating the
master IP address. This patch demotes such errors to warnings, allowing
the cluster to be destroyed even if the master IP address turndown
fails.
Signed-off-by: default avatarAndrea Spadaccini <spadaccio@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent b0943462
......@@ -1498,7 +1498,9 @@ class LUClusterDestroy(LogicalUnit):
ems = self.cfg.GetUseExternalMipScript()
result = self.rpc.call_node_deactivate_master_ip(master_params.name,
master_params, ems)
result.Raise("Could not disable the master role")
if result.fail_msg:
self.LogWarning("Error disabling the master IP address: %s",
result.fail_msg)
 
return master_params.name
 
......
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