From 9a1ac0eb74796584783af3d454de03fb32b0284d Mon Sep 17 00:00:00 2001
From: Alexander Presnyakov <alexander.presniakov@mariadb.com>
Date: Tue, 1 Apr 2025 14:51:52 +0000
Subject: [PATCH] Part of review changes to retrigger package build

---
 cmapi/cmapi_server/failover_agent.py   |  5 ++++-
 cmapi/cmapi_server/handlers/cluster.py |  7 +++++--
 cmapi/cmapi_server/helpers.py          |  5 +++--
 cmapi/cmapi_server/managers/process.py | 12 ++++++++++--
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/cmapi/cmapi_server/failover_agent.py b/cmapi/cmapi_server/failover_agent.py
index 9502d958a..1e4f5fdac 100644
--- a/cmapi/cmapi_server/failover_agent.py
+++ b/cmapi/cmapi_server/failover_agent.py
@@ -95,7 +95,10 @@ class FailoverAgent(AgentBase):
         try:
             # TODO: remove test_mode condition and add mock for testing
             if not test_mode:
-                MCSProcessManager.stop_node(is_primary=nc.is_primary_node(), is_read_only=nc.is_read_only())
+                MCSProcessManager.stop_node(
+                    is_primary=nc.is_primary_node(),
+                    is_read_only=nc.is_read_only(),
+                )
             logger.info(
                 'FA.enterStandbyMode(): successfully stopped node.'
             )
diff --git a/cmapi/cmapi_server/handlers/cluster.py b/cmapi/cmapi_server/handlers/cluster.py
index 245c7e273..f672d1762 100644
--- a/cmapi/cmapi_server/handlers/cluster.py
+++ b/cmapi/cmapi_server/handlers/cluster.py
@@ -162,7 +162,10 @@ class ClusterHandler():
         :rtype: dict
         """
         logger: logging.Logger = logging.getLogger('cmapi_server')
-        logger.debug('Cluster add node command called. Adding node %s in %s mode.', node, 'read-only' if read_only else 'read-write')
+        logger.debug(
+            'Cluster add node command called. '
+            f'Adding node {node} in {"read-only" if read_only else "read-write"} mode.'
+        )
 
         response = {'timestamp': str(datetime.now())}
 
@@ -179,7 +182,7 @@ class ClusterHandler():
                         output_config_filename=config
                     )
                 else:
-                    logger.debug("Node %s is read-only, skipping dbroot addition", node)
+                    logger.debug(f"Node {node} is read-only, skipping dbroot addition")
 
         except Exception as err:
             raise CMAPIBasicError('Error while adding node.') from err
diff --git a/cmapi/cmapi_server/helpers.py b/cmapi/cmapi_server/helpers.py
index 9ef711088..3efc13429 100644
--- a/cmapi/cmapi_server/helpers.py
+++ b/cmapi/cmapi_server/helpers.py
@@ -542,6 +542,7 @@ def get_desired_nodes(config=DEFAULT_MCS_CONF_PATH):
 
 
 def get_read_only_nodes(root) -> list[str]:
+    """Get names of read-only nodes from config"""
     return [node.text for node in root.findall("./ReadOnlyNodes/Node")]
 
 
@@ -603,8 +604,8 @@ def get_dbroots(node, config=DEFAULT_MCS_CONF_PATH):
                 )
 
     if dbroots and nc.is_read_only():
-        logger = logging.getLogger("dbroots")
-        logger.warning("Config contains dbroots %s for this read-only node, ignoring", dbroots)
+        logger = logging.getLogger('dbroots')
+        logger.warning(f'Config contains dbroots {dbroots} for this read-only node, ignoring')
         return []
 
     return dbroots
diff --git a/cmapi/cmapi_server/managers/process.py b/cmapi/cmapi_server/managers/process.py
index 8ddca4522..2feaec267 100644
--- a/cmapi/cmapi_server/managers/process.py
+++ b/cmapi/cmapi_server/managers/process.py
@@ -405,7 +405,12 @@ class MCSProcessManager:
         return set(node_progs) == set(p['name'] for p in running_procs)
 
     @classmethod
-    def start_node(cls, is_primary: bool, use_sudo: bool = True, is_read_only: bool = False) -> None:
+    def start_node(
+        cls,
+        is_primary: bool,
+        use_sudo: bool = True,
+        is_read_only: bool = False,
+    ) -> None:
         """Start mcs node processes.
 
         :param is_primary: is node primary or not, defaults to True
@@ -431,7 +436,10 @@ class MCSProcessManager:
                 cls._wait_for_workernodes()
             if prog_name in (MCSProgs.DML_PROC.value, MCSProgs.DDL_PROC.value):
                 cls._wait_for_controllernode()
-            if is_read_only and prog_name == MCSProgs.WRITE_ENGINE_SERVER.value:
+            if (
+                is_read_only and
+                prog_name == MCSProgs.WRITE_ENGINE_SERVER.value
+            ):
                 logging.debug('Node is in read-only mode, not starting WriteEngine')
                 continue
             if not cls.start(prog_name, is_primary, use_sudo):