More logging

Author: mariadb-AlexanderPresniakov

cmapi/cmapi_server/handlers/cluster.py

@@ -219,7 +219,7 @@ def add_node(
         :return: result of adding node
         :rtype: dict
         """
-        logger.debug(f'Cluster add node command called. Adding node {node}.')
+        logger.debug('Cluster add node command called. Adding node %s in %s mode.', node, 'read-only' if read_only else 'read-write')
 
         response = {'timestamp': str(datetime.now())}
         transaction_id = get_id()

cmapi/cmapi_server/node_manipulation.py

@@ -100,15 +100,19 @@ def add_node(
             if not read_only:
                 _add_WES(c_root, pm_num, node)
             else:
+                logging.debug("Node is read-only, skipping WES addition")
                 _add_read_only_node(c_root, node)
 
             _add_DBRM_Worker(c_root, node)
             _add_Module_entries(c_root, node)
             _add_active_node(c_root, node)
             _add_node_to_ExeMgrs(c_root, node)
-            if rebalance_dbroots and not read_only:
-                _rebalance_dbroots(c_root)
-                _move_primary_node(c_root)
+            if rebalance_dbroots:
+                if not read_only:
+                    _rebalance_dbroots(c_root)
+                    _move_primary_node(c_root)
+                else:
+                    logging.debug("Node is read-only, skipping dbroots rebalancing")
     except Exception:
         logging.error(
             'Caught exception while adding node, config file is unchanged',

cmapi/cmapi_server/process_dispatchers/base.py

@@ -79,7 +79,7 @@ def exec_command(
             del proc
             result = (True, output)
         else:
-            logging.debug('Waiting command to finish.')
+            logging.debug('Waiting for command to finish.')
             stdout_str, _ = proc.communicate()
             returncode = proc.wait()
             if stdout_str is not None:

cmapi/cmapi_server/process_dispatchers/systemd.py

@@ -64,7 +64,7 @@ def is_service_running(cls, service: str, use_sudo: bool = True) -> bool:
         ..Note:
             Not working with multiple services at a time.
         """
-        logging.debug(f'Checking "{service}" is running.')
+        logging.debug(f'Checking if "{service}" is running.')
         # TODO: remove conditions below when we'll drop CentOS 7 support
         cmd = 'show -p ActiveState --value'
         if cls.systemctl_version < 230:  # not supported --value in old version