Commit b726aff0 authored by Iustin Pop's avatar Iustin Pop

Convert node_start_master to new style result

This is used in multiple places outside cmdlib.py, so it's a more
interesting patch.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 6f68a739
......@@ -520,8 +520,10 @@ def main():
try:
# activate ip
master_node = ssconf.SimpleConfigReader().GetMasterNode()
if not rpc.RpcRunner.call_node_start_master(master_node, False):
logging.error("Can't activate master IP address")
result = rpc.RpcRunner.call_node_start_master(master_node, False)
msg = result.RemoteFailMsg()
if msg:
logging.error("Can't activate master IP address: %s", msg)
master.setup_queue()
try:
......
......@@ -189,25 +189,27 @@ def StartMaster(start_daemons):
@rtype: None
"""
ok = True
master_netdev, master_ip, _ = GetMasterInfo()
if not master_netdev:
return False
return False, "Cluster configuration incomplete, cannot read ssconf files"
payload = []
if utils.TcpPing(master_ip, constants.DEFAULT_NODED_PORT):
if utils.OwnIpAddress(master_ip):
# we already have the ip:
logging.debug("Already started")
logging.debug("Master IP already configured, doing nothing")
else:
logging.error("Someone else has the master ip, not activating")
ok = False
msg = "Someone else has the master ip, not activating"
logging.error(msg)
payload.append(msg)
else:
result = utils.RunCmd(["ip", "address", "add", "%s/32" % master_ip,
"dev", master_netdev, "label",
"%s:0" % master_netdev])
if result.failed:
logging.error("Can't activate master IP: %s", result.output)
ok = False
msg = "Can't activate master IP: %s" % result.output
logging.error(msg)
payload.append(msg)
result = utils.RunCmd(["arping", "-q", "-U", "-c 3", "-I", master_netdev,
"-s", master_ip, master_ip])
......@@ -218,9 +220,11 @@ def StartMaster(start_daemons):
for daemon in 'ganeti-masterd', 'ganeti-rapi':
result = utils.RunCmd([daemon])
if result.failed:
logging.error("Can't start daemon %s: %s", daemon, result.output)
ok = False
return ok
msg = "Can't start daemon %s: %s" % (daemon, result.output)
logging.error(msg)
payload.append(msg)
return not payload, "; ".join(payload)
def StopMaster(stop_daemons):
......
......@@ -271,6 +271,7 @@ def InitCluster(cluster_name, mac_prefix,
# start the master ip
# TODO: Review rpc call from bootstrap
# TODO: Warn on failed start master
rpc.RpcRunner.call_node_start_master(hostname.name, True)
......@@ -444,9 +445,10 @@ def MasterFailover():
cfg.Update(cluster_info)
result = rpc.RpcRunner.call_node_start_master(new_master, True)
if result.failed or not result.data:
msg = result.RemoteFailMsg()
if msg:
logging.error("Could not start the master role on the new master"
" %s, please check", new_master)
" %s, please check: %s", new_master, msg)
rcode = 1
return rcode
......
......@@ -1425,9 +1425,10 @@ class LURenameCluster(LogicalUnit):
finally:
result = self.rpc.call_node_start_master(master, False)
if result.failed or not result.data:
msg = result.RemoteFailMsg()
if msg:
self.LogWarning("Could not re-enable the master role on"
" the master, please restart manually.")
" the master, please restart manually: %s", msg)
def _RecursiveCheckIfLVMBased(disk):
......
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