Remove code that was moved to anothery PR

Author: mariadb-AlexanderPresniakov

cmapi/README.md

@@ -37,17 +37,17 @@ Packages have bundled python interpreter and python dependencies.
 ## Get dependencies
 
 # get portable python
-wget -qO- https://github.com/indygreg/python-build-standalone/releases/download/20220802/cpython-3.9.13+20220802-x86_64_v2-unknown-linux-gnu-pgo+lto-full.tar.zst | tar --zstd -xvf - -C ./
+wget -qO- https://cspkg.s3.amazonaws.com/python-dist-no-nis.tar.gz | tar xzf - -C ./
 
 # install python dependencies
-python/install/bin/pip3 install -t deps --only-binary :all -r requirements.txt
+python/bin/pip3 install -t deps --only-binary :all -r requirements.txt
 
 ## RPM
 
 ```sh
 ./cleanup.sh
 yum install -y wget cmake make rpm-build
-cmake -DRPM=1 -DSERVER_DIR=<path to server repo root> .
+cmake -DRPM=1 .
 make package
 ```
 
@@ -56,6 +56,6 @@ make package
 ```sh
 ./cleanup.sh
 DEBIAN_FRONTEND=noninteractive apt update && apt install -y cmake make
-cmake -DDEB=1 -DSERVER_DIR=<path to server repo root> .
+cmake -DDEB=1 .
 make package
 ```

cmapi/cmapi_server/constants.py

@@ -78,14 +78,14 @@ class ProgInfo(NamedTuple):
 ALL_MCS_PROGS: dict[str, ProgInfo] = {
     # workernode starts on primary and non primary node with 1 or 2 added
     # to subcommand (DBRM_Worker1 - on primary, DBRM_Worker2 - non primary)
-    MCSProgs.STORAGE_MANAGER.name: ProgInfo(15, 'mcs-storagemanager', '', False, 1),
-    MCSProgs.WORKER_NODE.name: ProgInfo(13, 'mcs-workernode', 'DBRM_Worker{}', False, 1),
-    MCSProgs.CONTROLLER_NODE.name: ProgInfo(11, 'mcs-controllernode', 'fg', True),
-    MCSProgs.PRIM_PROC.name: ProgInfo(5, 'mcs-primproc', '', False, 1),
-    MCSProgs.EXE_MGR.name: ProgInfo(9, 'mcs-exemgr', '', False, 1),
-    MCSProgs.WRITE_ENGINE_SERVER.name: ProgInfo(7, 'mcs-writeengineserver', '', False, 3),
-    MCSProgs.DML_PROC.name: ProgInfo(3, 'mcs-dmlproc', '', False),
-    MCSProgs.DDL_PROC.name: ProgInfo(1, 'mcs-ddlproc', '', False),
+    MCSProgs.STORAGE_MANAGER.value: ProgInfo(15, 'mcs-storagemanager', '', False, 1),
+    MCSProgs.WORKER_NODE.value: ProgInfo(13, 'mcs-workernode', 'DBRM_Worker{}', False, 1),
+    MCSProgs.CONTROLLER_NODE.value: ProgInfo(11, 'mcs-controllernode', 'fg', True),
+    MCSProgs.PRIM_PROC.value: ProgInfo(5, 'mcs-primproc', '', False, 1),
+    MCSProgs.EXE_MGR.value: ProgInfo(9, 'mcs-exemgr', '', False, 1),
+    MCSProgs.WRITE_ENGINE_SERVER.value: ProgInfo(7, 'mcs-writeengineserver', '', False, 3),
+    MCSProgs.DML_PROC.value: ProgInfo(3, 'mcs-dmlproc', '', False),
+    MCSProgs.DDL_PROC.value: ProgInfo(1, 'mcs-ddlproc', '', False),
 }
 
 # constants for docker container dispatcher

cmapi/cmapi_server/handlers/cluster.py

@@ -219,7 +219,7 @@ def add_node(
         :return: result of adding node
         :rtype: dict
         """
-        logger.info('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. 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/helpers.py

@@ -372,11 +372,6 @@ async def update_config(node, success_nodes, failed_nodes, headers, body):
                 logging.warning(
                     f'Timeout while pushing new config to "{node}"'
                 )
-            except requests.exceptions.RequestException as e:
-                logging.warning(
-                    'Error while pushing new config to "%s": %s"', node, str(e)
-                )
-                logging.debug('Response: %s', r.text)
             except Exception as e:
                 logging.warning(
                     f'Got an unexpected error pushing new config to "{node}"',

cmapi/cmapi_server/managers/process.py

@@ -419,19 +419,19 @@ def start_node(cls, is_primary: bool, use_sudo: bool = True, is_read_only: bool
         for prog_name in cls._get_sorted_progs(is_primary):
             if (
                     cls.dispatcher_name == 'systemd'
-                    and prog_name == MCSProgs.STORAGE_MANAGER.name
+                    and prog_name == MCSProgs.STORAGE_MANAGER.value
             ):
                 # TODO: MCOL-5458
                 logging.info(
                     f'Skip starting {prog_name} with systemd dispatcher.'
                 )
                 continue
             # TODO: additional error handling
-            if prog_name == MCSProgs.CONTROLLER_NODE.name:
+            if prog_name == MCSProgs.CONTROLLER_NODE.value:
                 cls._wait_for_workernodes()
-            if prog_name in (MCSProgs.DML_PROC.name, MCSProgs.DDL_PROC.name):
+            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.name:
+            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):

cmapi/cmapi_server/node_manipulation.py

@@ -55,7 +55,7 @@ def switch_node_maintenance(
         maintenance_element = etree.SubElement(config_root, 'Maintenance')
     maintenance_element.text = str(maintenance_state).lower()
     node_config.write_config(config_root, filename=output_config_filename)
-    # TODO: probably move publishing to cherrypy.engine failover channel here?
+    # TODO: probably move publishing to cherrypy.emgine failover channel here?
 
 
 def add_node(

cmapi/cmapi_server/process_dispatchers/base.py

@@ -79,7 +79,7 @@ def exec_command(
             del proc
             result = (True, output)
         else:
-            logging.debug('Waiting for command to finish.')
+            logging.debug('Waiting 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 if "{service}" is running.')
+        logging.debug(f'Checking "{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

cmapi/mcs_cluster_tool/__main__.py

@@ -38,20 +38,6 @@ def help_all():
     # Open the man page in interactive mode
     subprocess.run(['man', 'mcs'])
 
-@app.callback()
-def main(verbose: bool = typer.Option(False, "--verbose", "-v", help="Enable verbose logging to console")):
-    """Add a -v option and setup logging in every subcommand"""
-    setup_logging(verbose)
-
-
-def setup_logging(verbose: bool = False) -> None:
-    add_logging_level('TRACE', 5)
-    dict_config(MCS_CLI_LOG_CONF_PATH)
-
-    if verbose:
-        enable_console_logging(logging.getLogger())
-        enable_console_logging(logging.getLogger('mcs_cli'))
-
 
 if __name__ == '__main__':
     add_logging_level('TRACE', 5)  #TODO: remove when stadalone mode added.