sbcli-dev 3.8.45__zip → 3.8.47__zip

{sbcli_dev-3.8.45 → sbcli_dev-3.8.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-dev
-Version: 3.8.45
+Version: 3.8.47
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_dev-3.8.45 → sbcli_dev-3.8.47}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=3.8.45
+SIMPLY_BLOCK_VERSION=3.8.47
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main

{sbcli_dev-3.8.45 → sbcli_dev-3.8.47}/sbcli_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-dev
-Version: 3.8.45
+Version: 3.8.47
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_dev-3.8.45 → sbcli_dev-3.8.47}/simplyblock_core/constants.py

@@ -58,7 +58,6 @@ TASK_EXEC_INTERVAL_SEC = 30
 TASK_EXEC_RETRY_COUNT = 8
 
 SIMPLY_BLOCK_SPDK_CORE_IMAGE = "simplyblock/spdk-core:latest"
-SIMPLY_BLOCK_SPDK_CORE_IMAGE_ARM64 = "simplyblock/spdk-core:latest-arm64"
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:main-latest"
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE_JM = "simplyblock/spdk:feature-journal-ha-latest"
 

{sbcli_dev-3.8.45 → sbcli_dev-3.8.47}/simplyblock_core/controllers/health_controller.py

@@ -66,11 +66,11 @@ def _check_node_docker_api(ip):
     # return False
 
 
-def _check_node_rpc(rpc_ip, rpc_port, rpc_username, rpc_password):
+def _check_node_rpc(rpc_ip, rpc_port, rpc_username, rpc_password, timeout=60, retry=3):
     try:
         rpc_client = RPCClient(
             rpc_ip, rpc_port, rpc_username, rpc_password,
-            timeout=60, retry=3)
+            timeout=timeout, retry=retry)
         ret = rpc_client.get_version()
         if ret:
             logger.debug(f"SPDK version: {ret['version']}")
@@ -319,7 +319,7 @@ def check_remote_device(device_id):
             if node.get_id() == snode.get_id():
                 continue
             logger.info(f"Connecting to node: {node.get_id()}")
-            rpc_client = RPCClient(node.mgmt_ip, node.rpc_port, node.rpc_username, node.rpc_password)
+            rpc_client = RPCClient(node.mgmt_ip, node.rpc_port, node.rpc_username, node.rpc_password, timeout=5, retry=1)
             name = f"remote_{device.alceml_bdev}n1"
             ret = rpc_client.get_bdevs(name)
             if ret:

{sbcli_dev-3.8.45 → sbcli_dev-3.8.47}/simplyblock_core/distr_controller.py

@@ -60,7 +60,7 @@ def disconnect_device(device):
         if node.status != node.STATUS_ONLINE:
             continue
         new_remote_devices = []
-        rpc_client = RPCClient(node.mgmt_ip, node.rpc_port, node.rpc_username, node.rpc_password)
+        rpc_client = RPCClient(node.mgmt_ip, node.rpc_port, node.rpc_username, node.rpc_password, timeout=5, retry=1)
         for rem_dev in node.remote_devices:
             if rem_dev.get_id() == device.get_id():
                 ctrl_name = rem_dev.remote_bdev[:-2]

{sbcli_dev-3.8.45 → sbcli_dev-3.8.47}/simplyblock_core/services/storage_node_monitor.py

@@ -152,11 +152,11 @@ while True:
             spdk_process = health_controller._check_spdk_process_up(snode.mgmt_ip)
             logger.info(f"Check: spdk process {snode.mgmt_ip}:5000 ... {spdk_process}")
 
-            node_rpc_check = True
+            # node_rpc_check = True
             # 3- check node RPC
-            # node_rpc_check = health_controller._check_node_rpc(
-            #     snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
-            # logger.info(f"Check: node RPC {snode.mgmt_ip}:{snode.rpc_port} ... {node_rpc_check}")
+            node_rpc_check = health_controller._check_node_rpc(
+                snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password, timeout=5, retry=1)
+            logger.info(f"Check: node RPC {snode.mgmt_ip}:{snode.rpc_port} ... {node_rpc_check}")
 
             # 4- docker API
             node_docker_check = health_controller._check_node_docker_api(snode.mgmt_ip)

{sbcli_dev-3.8.45 → sbcli_dev-3.8.47}/simplyblock_core/storage_node_ops.py

@@ -286,40 +286,42 @@ def _create_jm_stack_on_raid(rpc_client, jm_nvme_bdevs, snode, after_restart):
         logger.error(f"Failed to create {jm_bdev}")
         return False
 
-
     alceml_id = str(uuid.uuid4())
-    # add pass through
-    pt_name = f"{jm_bdev}_PT"
-    ret = rpc_client.bdev_PT_NoExcl_create(pt_name, jm_bdev)
-    if not ret:
-        logger.error(f"Failed to create pt noexcl bdev: {pt_name}")
-        return False
-
-    subsystem_nqn = snode.subsystem + ":dev:" + jm_bdev
-    logger.info("creating subsystem %s", subsystem_nqn)
-    ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', jm_bdev)
-    IP = None
-    for iface in snode.data_nics:
-        if iface.ip4_address:
-            tr_type = iface.get_transport_type()
-            ret = rpc_client.transport_list()
-            found = False
-            if ret:
-                for ty in ret:
-                    if ty['trtype'] == tr_type:
-                        found = True
-            if found is False:
-                ret = rpc_client.transport_create(tr_type)
-            logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
-            ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
-            IP = iface.ip4_address
-            break
-    logger.info(f"add {pt_name} to subsystem")
-    ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
-    if not ret:
-        logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
-        return False
+    pt_name = ""
+    subsystem_nqn = ""
+    IP = ""
+    if snode.enable_ha_jm:
+        # add pass through
+        pt_name = f"{jm_bdev}_PT"
+        ret = rpc_client.bdev_PT_NoExcl_create(pt_name, jm_bdev)
+        if not ret:
+            logger.error(f"Failed to create pt noexcl bdev: {pt_name}")
+            return False
 
+        subsystem_nqn = snode.subsystem + ":dev:" + jm_bdev
+        logger.info("creating subsystem %s", subsystem_nqn)
+        ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', jm_bdev)
+        IP = None
+        for iface in snode.data_nics:
+            if iface.ip4_address:
+                tr_type = iface.get_transport_type()
+                ret = rpc_client.transport_list()
+                found = False
+                if ret:
+                    for ty in ret:
+                        if ty['trtype'] == tr_type:
+                            found = True
+                if found is False:
+                    ret = rpc_client.transport_create(tr_type)
+                logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
+                ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
+                IP = iface.ip4_address
+                break
+        logger.info(f"add {pt_name} to subsystem")
+        ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
+        if not ret:
+            logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
+            return False
 
     ret = rpc_client.get_bdevs(raid_bdev)
 
@@ -380,38 +382,41 @@ def _create_jm_stack_on_device(rpc_client, nvme, snode, after_restart):
         logger.error(f"Failed to create {jm_bdev}")
         return False
 
-    # add pass through
-    pt_name = f"{jm_bdev}_PT"
-    ret = rpc_client.bdev_PT_NoExcl_create(pt_name, jm_bdev)
-    if not ret:
-        logger.error(f"Failed to create pt noexcl bdev: {pt_name}")
-        return False
-
-    subsystem_nqn = snode.subsystem + ":dev:" + jm_bdev
-    logger.info("creating subsystem %s", subsystem_nqn)
-    ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', jm_bdev)
-    IP = None
-    for iface in snode.data_nics:
-        if iface.ip4_address:
-            tr_type = iface.get_transport_type()
-            ret = rpc_client.transport_list()
-            found = False
-            if ret:
-                for ty in ret:
-                    if ty['trtype'] == tr_type:
-                        found = True
-            if found is False:
-                ret = rpc_client.transport_create(tr_type)
-            logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
-            ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
-            IP = iface.ip4_address
-            break
-    logger.info(f"add {pt_name} to subsystem")
-    ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
-    if not ret:
-        logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
-        return False
+    pt_name = ""
+    subsystem_nqn = ""
+    IP = ""
+    if snode.enable_ha_jm:
+        # add pass through
+        pt_name = f"{jm_bdev}_PT"
+        ret = rpc_client.bdev_PT_NoExcl_create(pt_name, jm_bdev)
+        if not ret:
+            logger.error(f"Failed to create pt noexcl bdev: {pt_name}")
+            return False
 
+        subsystem_nqn = snode.subsystem + ":dev:" + jm_bdev
+        logger.info("creating subsystem %s", subsystem_nqn)
+        ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', jm_bdev)
+        IP = None
+        for iface in snode.data_nics:
+            if iface.ip4_address:
+                tr_type = iface.get_transport_type()
+                ret = rpc_client.transport_list()
+                found = False
+                if ret:
+                    for ty in ret:
+                        if ty['trtype'] == tr_type:
+                            found = True
+                if found is False:
+                    ret = rpc_client.transport_create(tr_type)
+                logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
+                ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
+                IP = iface.ip4_address
+                break
+        logger.info(f"add {pt_name} to subsystem")
+        ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
+        if not ret:
+            logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
+            return False
 
     return JMDevice({
         'uuid': alceml_id,
@@ -701,37 +706,38 @@ def _prepare_cluster_devices_on_restart(snode):
             logger.error(f"Failed to create {jm_bdev}")
             return False
 
-        # add pass through
-        pt_name = f"{jm_bdev}_PT"
-        ret = rpc_client.bdev_PT_NoExcl_create(pt_name, jm_bdev)
-        if not ret:
-            logger.error(f"Failed to create pt noexcl bdev: {pt_name}")
-            return False
+        if snode.enable_ha_jm:
+            # add pass through
+            pt_name = f"{jm_bdev}_PT"
+            ret = rpc_client.bdev_PT_NoExcl_create(pt_name, jm_bdev)
+            if not ret:
+                logger.error(f"Failed to create pt noexcl bdev: {pt_name}")
+                return False
 
-        subsystem_nqn = snode.subsystem + ":dev:" + jm_bdev
-        logger.info("creating subsystem %s", subsystem_nqn)
-        ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', jm_bdev)
-        IP = None
-        for iface in snode.data_nics:
-            if iface.ip4_address:
-                tr_type = iface.get_transport_type()
-                ret = rpc_client.transport_list()
-                found = False
-                if ret:
-                    for ty in ret:
-                        if ty['trtype'] == tr_type:
-                            found = True
-                if found is False:
-                    ret = rpc_client.transport_create(tr_type)
-                logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
-                ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
-                IP = iface.ip4_address
-                break
-        logger.info(f"add {pt_name} to subsystem")
-        ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
-        if not ret:
-            logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
-            return False
+            subsystem_nqn = snode.subsystem + ":dev:" + jm_bdev
+            logger.info("creating subsystem %s", subsystem_nqn)
+            ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', jm_bdev)
+            IP = None
+            for iface in snode.data_nics:
+                if iface.ip4_address:
+                    tr_type = iface.get_transport_type()
+                    ret = rpc_client.transport_list()
+                    found = False
+                    if ret:
+                        for ty in ret:
+                            if ty['trtype'] == tr_type:
+                                found = True
+                    if found is False:
+                        ret = rpc_client.transport_create(tr_type)
+                    logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
+                    ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
+                    IP = iface.ip4_address
+                    break
+            logger.info(f"add {pt_name} to subsystem")
+            ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
+            if not ret:
+                logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
+                return False
 
     return True
 
@@ -1847,7 +1853,7 @@ def shutdown_storage_node(node_id, force=False):
     storage_events.snode_status_change(snode, snode.status, old_status)
 
     rpc_client = RPCClient(
-        snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
+        snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password, timeout=10, retry=1)
 
     logger.debug("Removing LVols")
     _remove_bdev_stack(snode.lvstore_stack, rpc_client, remove_distr_only=True)