Revision 7c74bbe0
b/lib/bootstrap.py | ||
---|---|---|
565 | 565 |
""" |
566 | 566 |
cfg = config.ConfigWriter() |
567 | 567 |
modify_ssh_setup = cfg.GetClusterInfo().modify_ssh_setup |
568 |
result = rpc.BootstrapRunner().call_node_stop_master(master) |
|
568 |
runner = rpc.BootstrapRunner() |
|
569 |
|
|
570 |
result = runner.call_node_deactivate_master_ip(master) |
|
571 |
msg = result.fail_msg |
|
572 |
if msg: |
|
573 |
logging.warning("Could not disable the master IP: %s", msg) |
|
574 |
|
|
575 |
result = runner.call_node_stop_master(master) |
|
569 | 576 |
msg = result.fail_msg |
570 | 577 |
if msg: |
571 | 578 |
logging.warning("Could not disable the master role: %s", msg) |
572 |
result = rpc.BootstrapRunner().call_node_leave_cluster(master, |
|
573 |
modify_ssh_setup)
|
|
579 |
|
|
580 |
result = runner.call_node_leave_cluster(master, modify_ssh_setup)
|
|
574 | 581 |
msg = result.fail_msg |
575 | 582 |
if msg: |
576 | 583 |
logging.warning("Could not shutdown the node daemon and cleanup" |
... | ... | |
698 | 705 |
|
699 | 706 |
logging.info("Stopping the master daemon on node %s", old_master) |
700 | 707 |
|
701 |
result = rpc.BootstrapRunner().call_node_stop_master(old_master) |
|
708 |
runner = rpc.BootstrapRunner() |
|
709 |
result = runner.call_node_deactivate_master_ip(old_master) |
|
710 |
msg = result.fail_msg |
|
711 |
if msg: |
|
712 |
logging.warning("Could not disable the master IP: %s", msg) |
|
713 |
|
|
714 |
result = runner.call_node_stop_master(old_master) |
|
702 | 715 |
msg = result.fail_msg |
703 | 716 |
if msg: |
704 | 717 |
logging.error("Could not disable the master role on the old master" |
b/lib/server/noded.py | ||
---|---|---|
708 | 708 |
|
709 | 709 |
@staticmethod |
710 | 710 |
def perspective_node_stop_master(params): |
711 |
"""Deactivate the master IP and stops master daemons on this node. |
|
712 |
|
|
713 |
Sometimes both operations need to be executed at the same time (doing one of |
|
714 |
the two would make impossible to do the other one). |
|
711 |
"""Stops master daemons on this node. |
|
715 | 712 |
|
716 | 713 |
""" |
717 |
backend.DeactivateMasterIp() |
|
718 | 714 |
return backend.StopMasterDaemons() |
719 | 715 |
|
720 | 716 |
@staticmethod |
Also available in: Unified diff