MCOL-5964: support MCOL-5861 readonly nodes engine side

.drone.jsonnet

@@ -176,7 +176,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
   publish(step_prefix="pkg", eventp=event + "/${DRONE_BUILD_NUMBER}"):: {
     name: "publish " + step_prefix,
     depends_on: [std.strReplace(step_prefix, " latest", ""), "createrepo"],
-    image: "amazon/aws-cli",
+    image: "amazon/aws-cli:2.23.5",
     when: {
       status: ["success", "failure"],
     },
@@ -271,7 +271,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
   smoke:: {
     name: "smoke",
     depends_on: ["publish pkg"],
-    image: "docker",
+    image: "docker:28.2.2",
     volumes: [pipeline._volumes.mdb, pipeline._volumes.docker],
     commands: [
       prepareTestStage(getContainerName("smoke"), result, true),
@@ -281,7 +281,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
   smokelog:: {
     name: "smokelog",
     depends_on: ["smoke"],
-    image: "docker",
+    image: "docker:28.2.2",
     volumes: [pipeline._volumes.docker, pipeline._volumes.mdb],
     commands: [
       reportTestStage(getContainerName("smoke"), result, "smoke"),
@@ -293,7 +293,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
   upgrade(version):: {
     name: "upgrade-test from " + version,
     depends_on: ["regressionlog"],
-    image: "docker",
+    image: "docker:28.2.2",
     volumes: [pipeline._volumes.docker],
     environment: {
       UPGRADE_TOKEN: {
@@ -314,7 +314,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
   upgradelog:: {
     name: "upgradelog",
     depends_on: std.map(function(p) "upgrade-test from " + p, mdb_server_versions),
-    image: "docker",
+    image: "docker:28.2.2",
     volumes: [pipeline._volumes.docker, pipeline._volumes.mdb],
     commands:
        ["echo"] +
@@ -377,7 +377,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
   mtrlog:: {
     name: "mtrlog",
     depends_on: ["mtr"],
-    image: "docker",
+    image: "docker:28.2.2",
     volumes: [pipeline._volumes.docker, pipeline._volumes.mdb],
     commands: [
       reportTestStage(getContainerName("mtr"), result, "mtr"),
@@ -467,7 +467,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
   regressionlog:: {
     name: "regressionlog",
     depends_on: [regression_tests[std.length(regression_tests) - 1]],
-    image: "docker",
+    image: "docker:28.2.2",
     volumes: [pipeline._volumes.docker, pipeline._volumes.mdb],
     commands: [
       reportTestStage(getContainerName("regression"), result, "regression"),
@@ -480,7 +480,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
     name: "dockerfile",
     depends_on: ["publish pkg", "publish cmapi build"],
     //failure: 'ignore',
-    image: "alpine/git",
+    image: "alpine/git:2.49.0",
     environment: {
       DOCKER_BRANCH_REF: "${DRONE_SOURCE_BRANCH}",
       DOCKER_REF_AUX: branch_ref,
@@ -554,7 +554,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
   cmapilog:: {
     name: "cmapilog",
     depends_on: ["cmapi test"],
-    image: "docker",
+    image: "docker:28.2.2",
     volumes: [pipeline._volumes.docker, pipeline._volumes.mdb],
     commands: [
       reportTestStage(getContainerName("cmapi"), result, "cmapi"),
@@ -567,7 +567,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
     name: "mtr",
     depends_on: ["dockerhub"],
     //failure: 'ignore',
-    image: "docker",
+    image: "docker:28.2.2",
     volumes: [pipeline._volumes.docker],
     environment: {
       DOCKER_LOGIN: {
@@ -604,7 +604,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
   steps: [
            {
              name: "submodules",
-             image: "alpine/git",
+             image: "alpine/git:2.49.0",
              commands: [
                "git submodule update --init --recursive",
                "git config cmake.update-submodules no",
@@ -613,7 +613,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
            },
            {
              name: "clone-mdb",
-             image: "alpine/git",
+             image: "alpine/git:2.49.0",
              volumes: [pipeline._volumes.mdb],
              environment: {
                SERVER_REF: "${SERVER_REF:-" + server + "}",
@@ -662,7 +662,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
                        + get_sccache
                        + customEnvCommands(customBuildEnvCommandsMapKey, builddir) +
                        [
-                        'bash -c "set -o pipefail && bash /mdb/' + builddir + "/storage/columnstore/columnstore/build/bootstrap_mcs.sh " +
+                         'bash -c "set -o pipefail && bash /mdb/' + builddir + "/storage/columnstore/columnstore/build/bootstrap_mcs.sh " +
                          "--build-type RelWithDebInfo " +
                          "--distro " + platform + " " +
                          "--build-packages --install-deps --sccache " +
@@ -714,7 +714,7 @@ local Pipeline(branch, platform, event, arch="amd64", server="10.6-enterprise",
            {
              name: "pkg",
              depends_on: ["unittests"],
-             image: "alpine/git",
+             image: "alpine/git:2.49.0",
              when: {
                status: ["success", "failure"],
              },

CMakeLists.txt

@@ -47,6 +47,7 @@ include(columnstore_version)
 include(configureEngine)
 include(compiler_flags)
 include(misc)
+include(cpack_manage)
 
 set(COMPONENTS
     dbcon/mysql

build/bootstrap_mcs.sh

@@ -742,8 +742,7 @@ if [[ $BUILD_PACKAGES = true ]]; then
     modify_packaging
     build_package
     message_splitted "PACKAGES BUILD FINISHED"
-
-    return 0
+    exit 0
 fi
 
 stop_service

cmake/cpack_manage.cmake

@@ -0,0 +1,33 @@
+macro(columnstore_append_for_cpack var_name)
+    # Get current value from parent scope or use empty string
+    if(DEFINED ${var_name})
+        set(current_val "${${var_name}}")
+    else()
+        set(current_val "")
+    endif()
+
+    # Process each argument to append
+    foreach(arg IN LISTS ARGN)
+        if(current_val)
+            # If not empty, add comma before new item
+            set(current_val "${current_val}, ${arg}")
+        else()
+            # If empty, just add the item
+            set(current_val "${arg}")
+        endif()
+    endforeach()
+
+    # Set back in parent scope
+    set(${var_name}
+        "${current_val}"
+        PARENT_SCOPE
+    )
+endmacro()
+
+macro(columnstore_add_rpm_deps)
+    columnstore_append_for_cpack(CPACK_RPM_columnstore-engine_PACKAGE_REQUIRES ${ARGN})
+endmacro()
+
+if(RPM)
+    columnstore_add_rpm_deps("snappy" "jemalloc" "procps-ng" "gawk")
+endif()

cmapi/cmapi_server/constants.py

@@ -4,6 +4,7 @@
 """
 import os
 from typing import NamedTuple
+from enum import Enum
 
 
 # default MARIADB ColumnStore config path
@@ -53,6 +54,16 @@
     CMAPI_INSTALL_PATH, 'cmapi_server/SingleNode.xml'
 )
 
+class MCSProgs(Enum):
+    STORAGE_MANAGER = 'StorageManager'
+    WORKER_NODE = 'workernode'
+    CONTROLLER_NODE = 'controllernode'
+    PRIM_PROC = 'PrimProc'
+    # EXE_MGR = 'ExeMgr'
+    WRITE_ENGINE_SERVER = 'WriteEngineServer'
+    DML_PROC = 'DMLProc'
+    DDL_PROC = 'DDLProc'
+
 # constants for dispatchers
 class ProgInfo(NamedTuple):
     """NamedTuple for some additional info about handling mcs processes."""
@@ -66,17 +77,17 @@ class ProgInfo(NamedTuple):
 # on top level of process handling
 # mcs-storagemanager starts conditionally inside mcs-loadbrm, but should be
 # stopped using cmapi
-ALL_MCS_PROGS = {
+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)
-    'StorageManager': ProgInfo(15, 'mcs-storagemanager', '', False, 1),
-    'workernode': ProgInfo(13, 'mcs-workernode', 'DBRM_Worker{}', False, 1),
-    'controllernode': ProgInfo(11, 'mcs-controllernode', 'fg', True),
-    'PrimProc': ProgInfo(5, 'mcs-primproc', '', False, 1),
-    'ExeMgr': ProgInfo(9, 'mcs-exemgr', '', False, 1),
-    'WriteEngineServer': ProgInfo(7, 'mcs-writeengineserver', '', False, 3),
-    'DMLProc': ProgInfo(3, 'mcs-dmlproc', '', False),
-    'DDLProc': 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/controllers/api_clients.py

@@ -68,6 +68,7 @@ def add_node(
         :param node_info: Information about the node to add.
         :return: The response from the API.
         """
+        #TODO: fix interface as in remove_node used or think about universal
         return self._request('PUT', 'node', {**node_info, **extra})
 
     def remove_node(

cmapi/cmapi_server/controllers/endpoints.py

@@ -434,7 +434,8 @@ def put_config(self):
                 MCSProcessManager.stop_node(
                     is_primary=node_config.is_primary_node(),
                     use_sudo=use_sudo,
-                    timeout=request_timeout
+                    timeout=request_timeout,
+                    is_read_only=node_config.is_read_only(),
                 )
             except CMAPIBasicError as err:
                 raise_422_error(
@@ -463,6 +464,7 @@ def put_config(self):
                     MCSProcessManager.start_node(
                         is_primary=node_config.is_primary_node(),
                         use_sudo=use_sudo,
+                        is_read_only=node_config.is_read_only(),
                     )
                 except CMAPIBasicError as err:
                     raise_422_error(
@@ -666,7 +668,8 @@ def put_start(self):
         try:
             MCSProcessManager.start_node(
                 is_primary=node_config.is_primary_node(),
-                use_sudo=use_sudo
+                use_sudo=use_sudo,
+                is_read_only=node_config.is_read_only(),
             )
         except CMAPIBasicError as err:
             raise_422_error(
@@ -701,7 +704,8 @@ def put_shutdown(self):
             MCSProcessManager.stop_node(
                 is_primary=node_config.is_primary_node(),
                 use_sudo=use_sudo,
-                timeout=timeout
+                timeout=timeout,
+                is_read_only=node_config.is_read_only(),
             )
         except CMAPIBasicError as err:
             raise_422_error(
@@ -744,6 +748,9 @@ def get_brm_bytes(self, element:str):
                 ret = subprocess.run(args, stdout=subprocess.PIPE)
                 if ret.returncode != 0:
                     module_logger.warning(f"{func_name} got error code {ret.returncode} from smcat, retrying")
+                    stderr = ret.stderr
+                    module_logger.warning(f"{func_name} smcat stderr: {stderr}")
+                    module_logger.warning(f"{func_name} smcat: {args}")
                     time.sleep(1)
                     retry_count += 1
                     continue
@@ -763,6 +770,8 @@ def get_brm_bytes(self, element:str):
                 ret = subprocess.run(args, stdout=subprocess.PIPE)
                 if ret.returncode != 0:
                     module_logger.warning(f"{func_name} got error code {ret.returncode} from smcat, retrying")
+                    stderr = ret.stderr
+                    module_logger.warning(f"{func_name} smcat stderr: {stderr}")
                     time.sleep(1)
                     retry_count += 1
                     continue
@@ -910,16 +919,17 @@ def put_add_node(self):
         node = request_body.get('node', None)
         config = request_body.get('config', DEFAULT_MCS_CONF_PATH)
         in_transaction = request_body.get('in_transaction', False)
+        read_only = request_body.get('read_only', False)
 
         if node is None:
             raise_422_error(module_logger, func_name, 'missing node argument')
 
         try:
             if not in_transaction:
                 with TransactionManager(extra_nodes=[node]):
-                    response = ClusterHandler.add_node(node, config)
+                    response = ClusterHandler.add_node(node, config, read_only)
             else:
-                response = ClusterHandler.add_node(node, config)
+                response = ClusterHandler.add_node(node, config, read_only)
         except CMAPIBasicError as err:
             raise_422_error(module_logger, func_name, err.message)
 

cmapi/cmapi_server/failover_agent.py

@@ -95,7 +95,10 @@ def enterStandbyMode(self, test_mode = False):
         try:
             # TODO: remove test_mode condition and add mock for testing
             if not test_mode:
-                MCSProcessManager.stop_node(is_primary=nc.is_primary_node())
+                MCSProcessManager.stop_node(
+                    is_primary=nc.is_primary_node(),
+                    is_read_only=nc.is_read_only(),
+                )
             logger.info(
                 'FA.enterStandbyMode(): successfully stopped node.'
             )

cmapi/cmapi_server/handlers/cluster.py

@@ -139,14 +139,19 @@ def shutdown(
         return {'timestamp': operation_start_time}
 
     @staticmethod
-    def add_node(node: str, config: str = DEFAULT_MCS_CONF_PATH) -> dict:
+    def add_node(
+        node: str, config: str = DEFAULT_MCS_CONF_PATH,
+        read_only: bool = False,
+    ) -> dict:
         """Method to add node to MCS CLuster.
 
         :param node: node IP or name or FQDN
         :type node: str
         :param config: columnstore xml config file path,
                        defaults to DEFAULT_MCS_CONF_PATH
         :type config: str, optional
+        :param read_only: add node in read-only mode, defaults to False
+        :type read_only: bool, optional
         :raises CMAPIBasicError: on exception while starting transaction
         :raises CMAPIBasicError: if transaction start isn't successful
         :raises CMAPIBasicError: on exception while adding node
@@ -157,20 +162,30 @@ def add_node(node: str, config: str = DEFAULT_MCS_CONF_PATH) -> dict:
         :rtype: dict
         """
         logger: logging.Logger = logging.getLogger('cmapi_server')
-        logger.debug(f'Cluster add node command called. Adding node {node}.')
+        logger.debug(
+            f'Cluster add node command called. Adding node {node} in '
+            f'{"read-only" if read_only else "read-write"} mode.'
+        )
 
         response = {'timestamp': str(datetime.now())}
 
         try:
             add_node(
                 node, input_config_filename=config,
-                output_config_filename=config
+                output_config_filename=config,
+                read_only=read_only,
             )
             if not get_dbroots(node, config):
-                add_dbroot(
-                    host=node, input_config_filename=config,
-                    output_config_filename=config
-                )
+                if not read_only:  # Read-only nodes don't own dbroots
+                    add_dbroot(
+                        host=node, input_config_filename=config,
+                        output_config_filename=config
+                    )
+                else:
+                    logger.debug(
+                        f'Node {node} is read-only, skipping dbroot addition'
+                    )
+
         except Exception as err:
             raise CMAPIBasicError('Error while adding node.') from err