Revision 6c00d19a lib/bootstrap.py

b/lib/bootstrap.py
318 318

  
319 319
  """
320 320
  result = rpc.RpcRunner.call_node_stop_master(master, True)
321
  if result.failed or not result.data:
322
    logging.warning("Could not disable the master role")
321
  msg = result.RemoteFailMsg()
322
  if msg:
323
    logging.warning("Could not disable the master role: %s" % msg)
323 324
  result = rpc.RpcRunner.call_node_leave_cluster(master)
324 325
  if result.failed or not result.data:
325 326
    logging.warning("Could not shutdown the node daemon and cleanup the node")
......
428 429
  logging.info("Setting master to %s, old master: %s", new_master, old_master)
429 430

  
430 431
  result = rpc.RpcRunner.call_node_stop_master(old_master, True)
431
  if result.failed or not result.data:
432
  msg = result.RemoteFailMsg()
433
  if msg:
432 434
    logging.error("Could not disable the master role on the old master"
433
                 " %s, please disable manually", old_master)
435
                 " %s, please disable manually: %s", old_master, msg)
434 436

  
435 437
  # Here we have a phase where no master should be running
436 438

  

Also available in: Unified diff