sbcli-hmdi 0.0.17__tar.gz → 0.0.19__tar.gz

{sbcli_hmdi-0.0.17 → sbcli_hmdi-0.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-hmdi
-Version: 0.0.17
+Version: 0.0.19
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_hmdi-0.0.17 → sbcli_hmdi-0.0.19}/sbcli_hmdi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-hmdi
-Version: 0.0.17
+Version: 0.0.19
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_hmdi-0.0.17 → sbcli_hmdi-0.0.19}/simplyblock_core/controllers/health_controller.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 
-from simplyblock_core import utils, distr_controller
+from simplyblock_core import utils, distr_controller, storage_node_ops
 from simplyblock_core.db_controller import DBController
 from simplyblock_core.models.cluster import Cluster
 from simplyblock_core.models.nvme_device import NVMeDevice, JMDevice
@@ -151,6 +151,11 @@ def _check_node_lvstore(lvstore_stack, node, auto_fix=False):
                                 if result['Kind'] == "Device":
                                     if result['Reported Status']:
                                         dev = db_controller.get_storage_device_by_id(result['UUID'])
+                                        if dev.status == NVMeDevice.STATUS_ONLINE:
+                                            node = db_controller.get_storage_node_by_id(node.get_id())
+                                            remote_devices = storage_node_ops._connect_to_remote_devs(node)
+                                            node.remote_devices = remote_devices
+                                            node.write_to_db()
                                         distr_controller.send_dev_status_event(dev, dev.status, node)
                                 if result['Kind'] == "Node":
                                     n = db_controller.get_storage_node_by_id(result['UUID'])

{sbcli_hmdi-0.0.17 → sbcli_hmdi-0.0.19}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-hmdi
-SIMPLY_BLOCK_VERSION=0.0.17
+SIMPLY_BLOCK_VERSION=0.0.19
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:hmdi
 DOCKER_USER=hamdysimplyblock

{sbcli_hmdi-0.0.17 → sbcli_hmdi-0.0.19}/simplyblock_core/services/health_check_service.py

@@ -122,26 +122,26 @@ while True:
                             connected_devices.append(remote_device.get_id())
                         else:
                             logger.info(f"Checking bdev: {remote_device.remote_bdev} ... not found")
-                            # if not org_dev.alceml_bdev:
-                            #     logger.error(f"device alceml bdev not found!, {org_dev.get_id()}")
-                            #     continue
-                            # name = f"remote_{org_dev.alceml_bdev}"
+                            if not org_dev.alceml_bdev:
+                                logger.error(f"device alceml bdev not found!, {org_dev.get_id()}")
+                                continue
+                            name = f"remote_{org_dev.alceml_bdev}"
                             # if rpc_client.bdev_nvme_controller_list(name):
                             #     logger.info(f"detaching {name} from {snode.get_id()}")
                             #     rpc_client.bdev_nvme_detach_controller(name)
                             #     time.sleep(1)
-                            #
-                            # logger.info(f"Connecting {name} to {snode.get_id()}")
-                            # ret = rpc_client.bdev_nvme_attach_controller_tcp(
-                            #     name, org_dev.nvmf_nqn, org_dev.nvmf_ip, org_dev.nvmf_port)
-                            # if ret:
-                            #     logger.info(f"Successfully connected to device: {org_dev.get_id()}")
-                            #     remote_device.status = NVMeDevice.STATUS_ONLINE
-                            #     connected_devices.append(org_dev.get_id())
-                            #     snode.write_to_db()
-                            #     distr_controller.send_dev_status_event(org_dev, NVMeDevice.STATUS_ONLINE, snode)
-                            # else:
-                            #     logger.error(f"Failed to connect to device: {org_dev.get_id()}")
+
+                            logger.info(f"Connecting {name} to {snode.get_id()}")
+                            ret = rpc_client.bdev_nvme_attach_controller_tcp(
+                                name, org_dev.nvmf_nqn, org_dev.nvmf_ip, org_dev.nvmf_port)
+                            if ret:
+                                logger.info(f"Successfully connected to device: {org_dev.get_id()}")
+                                remote_device.status = NVMeDevice.STATUS_ONLINE
+                                connected_devices.append(org_dev.get_id())
+                                snode.write_to_db()
+                                distr_controller.send_dev_status_event(org_dev, NVMeDevice.STATUS_ONLINE, snode)
+                            else:
+                                logger.error(f"Failed to connect to device: {org_dev.get_id()}")
 
                         node_remote_devices_check &= bool(ret)
 

{sbcli_hmdi-0.0.17 → sbcli_hmdi-0.0.19}/simplyblock_core/services/main_distr_event_collector.py

@@ -71,10 +71,19 @@ def process_device_event(event):
             event.status = 'skipped:node_offline'
             return
 
-        logger.info(f"Setting device to unavailable")
-        device_controller.device_set_unavailable(device_obj.get_id())
-        if event.message in ['error_write', 'error_unmap', 'error_read']:
-            device_controller.device_set_io_error(device_obj.get_id(), True)
+        if device_node_obj.get_id() != event_node_obj.get_id() and event.message == 'error_open':
+            for dev in event_node_obj.remote_devices:
+                if dev.get_id() == device_obj.get_id():
+                    dev.status = NVMeDevice.STATUS_UNAVAILABLE
+                    event_node_obj.write_to_db()
+                    break
+
+        else:
+
+            logger.info(f"Setting device to unavailable")
+            device_controller.device_set_unavailable(device_obj.get_id())
+            if event.message in ['error_write', 'error_unmap', 'error_read']:
+                device_controller.device_set_io_error(device_obj.get_id(), True)
 
         event.status = 'processed'
 

{sbcli_hmdi-0.0.17 → sbcli_hmdi-0.0.19}/simplyblock_core/storage_node_ops.py

@@ -3031,7 +3031,7 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
     strip_size_kb = utils.nearest_upper_power_of_2(strip_size_kb)
     jm_vuid = 0
     jm_ids = []
-    lvol_subsys_port = 9090
+    lvol_subsys_port = utils.get_next_port(snode.cluster_id)
     if snode.enable_ha_jm:
         jm_vuid = utils.get_random_vuid()
         jm_ids = get_sorted_ha_jms(snode)

{sbcli_hmdi-0.0.17 → sbcli_hmdi-0.0.19}/simplyblock_core/utils.py

@@ -714,3 +714,22 @@ def handle_task_result(task: JobSchedule, res: dict, allowed_error_codes = None)
 
 
 logger = get_logger(__name__)
+
+
+def get_next_port(cluster_id):
+    from simplyblock_core.db_controller import DBController
+    db_controller = DBController()
+
+    port = 9090
+    used_ports = []
+    for node in db_controller.get_storage_nodes_by_cluster_id(cluster_id):
+        if node.lvol_subsys_port > 0 and node.lvol_subsys_port != 4420:
+            used_ports.append(node.lvol_subsys_port)
+
+    for i in range(100):
+        next_port = port + i
+
+        if next_port not in used_ports:
+            return next_port
+
+    return 0