Skip to content

Commit 9e946fb

Browse files
committed
Dev: bootstrap: Disable pacemaker and sbd services after removing node
1 parent 52a1e2b commit 9e946fb

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

crmsh/bootstrap.py

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
PCMK_REMOTE_AUTH = "/etc/pacemaker/authkey"
6767
COROSYNC_CONF_ORIG = tmpfiles.create()[1]
6868
SERVICES_STOP_LIST = ["corosync-qdevice.service", "corosync.service", "hawk.service", CSYNC2_SERVICE]
69+
SERVICES_DISABLE_LIST = ["pacemaker.service", "sbd.service"]
6970
WATCHDOG_CFG = "/etc/modules-load.d/watchdog.conf"
7071
BOOTH_DIR = "/etc/booth"
7172
BOOTH_CFG = "/etc/booth/booth.conf"
@@ -832,7 +833,7 @@ def start_pacemaker(node_list=[], enable_flag=False):
832833
except ValueError as err:
833834
node_list.remove(node)
834835
logger.error(err)
835-
logger.info("Starting pacemaker.service on %s", ', '.join(node_list) or utils.this_node())
836+
logger.info("Starting and enable pacemaker.service on %s", ', '.join(node_list) or utils.this_node())
836837
return service_manager.start_service("pacemaker.service", enable=enable_flag, node_list=node_list)
837838

838839

@@ -2357,15 +2358,19 @@ def get_cluster_node_ip(node: str) -> str:
23572358
return ip
23582359

23592360

2360-
def stop_services(stop_list, remote_addr=None):
2361+
def stop_and_disable_services(remote_addr=None):
23612362
"""
2362-
Stop cluster related service
2363+
Stop and disable cluster related service
23632364
"""
23642365
service_manager = ServiceManager()
2365-
for service in stop_list:
2366+
for service in SERVICES_STOP_LIST:
23662367
if service_manager.service_is_active(service, remote_addr=remote_addr):
2367-
logger.info("Stopping the %s on %s", service, remote_addr if remote_addr else utils.this_node())
2368+
logger.info("Stopping and disable %s on node %s", service, remote_addr or utils.this_node())
23682369
service_manager.stop_service(service, disable=True, remote_addr=remote_addr)
2370+
for service in SERVICES_DISABLE_LIST:
2371+
if service_manager.service_is_enabled(service, remote_addr=remote_addr):
2372+
logger.info("Disable %s on node %s", service, remote_addr or utils.this_node())
2373+
service_manager.disable_service(service, remote_addr=remote_addr)
23692374

23702375

23712376
def rm_configuration_files(remote=None):
@@ -2405,7 +2410,7 @@ def remove_node_from_cluster(node, dead_node=False):
24052410

24062411
node_ip = get_cluster_node_ip(node)
24072412
if not dead_node:
2408-
stop_services(SERVICES_STOP_LIST, remote_addr=node)
2413+
stop_and_disable_services(remote_addr=node)
24092414
qdevice.QDevice.remove_qdevice_db([node])
24102415
rm_configuration_files(node)
24112416

@@ -2818,7 +2823,7 @@ def remove_self(force_flag=False):
28182823
print(stdout)
28192824
else:
28202825
# disable and stop cluster
2821-
stop_services(SERVICES_STOP_LIST)
2826+
stop_and_disable_services()
28222827
qdevice.QDevice.remove_certification_files_on_qnetd()
28232828
qdevice.QDevice.remove_qdevice_db([utils.this_node()])
28242829
rm_configuration_files()

0 commit comments

Comments
 (0)