Skip to content

Commit f0ad954

Browse files
Remove WES stop exclusion logic
1 parent a034585 commit f0ad954

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

cmapi/cmapi_server/managers/process.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -471,9 +471,6 @@ def stop_node(
471471
# undefined behaviour when primary gone and then recovers (failover
472472
# triggered 2 times).
473473
for prog_name in cls._get_sorted_progs(True, reverse=True):
474-
if is_read_only and prog_name == MCSProgs.WRITE_ENGINE_SERVER.value:
475-
logging.debug('Node is in read-only mode, not stopping WriteEngine')
476-
continue
477474
if not cls.stop(prog_name, is_primary, use_sudo):
478475
logging.error(f'Process "{prog_name}" not stopped properly.')
479476
raise CMAPIBasicError(f'Error while stopping "{prog_name}"')

cmapi/cmapi_server/node_manipulation.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,6 +1016,9 @@ def _add_read_only_node(root, node) -> None:
10161016
else:
10171017
for n in read_only_nodes.findall("./Node"):
10181018
if n.text == node:
1019+
logging.warning(
1020+
f"_add_read_only_node(): node {node} already exists in ReadOnlyNodes"
1021+
)
10191022
return
10201023

10211024
etree.SubElement(read_only_nodes, "Node").text = node

cmapi/mcs_cluster_tool/__main__.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ def setup_logging(verbose: bool = False) -> None:
6767
add_logging_level('TRACE', 5)
6868
dict_config(MCS_CLI_LOG_CONF_PATH)
6969
if verbose:
70-
enable_console_logging(logging.getLogger())
70+
for logger_name in ("", "mcs_cli"):
71+
logger = logging.getLogger(logger_name)
72+
logger.setLevel(logging.DEBUG)
73+
enable_console_logging(logger)
7174

7275

7376
if __name__ == '__main__':

0 commit comments

Comments
 (0)