sbcli-hmdi 0.0.27__tar.gz → 0.0.30__tar.gz

{sbcli_hmdi-0.0.27 → sbcli_hmdi-0.0.30}/PKG-INFO

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

{sbcli_hmdi-0.0.27 → sbcli_hmdi-0.0.30}/sbcli_hmdi.egg-info/PKG-INFO

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

{sbcli_hmdi-0.0.27 → sbcli_hmdi-0.0.30}/simplyblock_core/constants.py

@@ -76,7 +76,7 @@ TASK_EXEC_RETRY_COUNT = 8
 SIMPLY_BLOCK_SPDK_CORE_IMAGE = "simplyblock/spdk-core:v24.05-tag-latest"
 
 
-SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:main-6c4d644e-amd64"
+SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:SFAM-1702_ultra-96049924"
 
 GELF_PORT = 12202
 

{sbcli_hmdi-0.0.27 → sbcli_hmdi-0.0.30}/simplyblock_core/controllers/health_controller.py

@@ -151,11 +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()
+                                        if dev.status == NVMeDevice.STATUS_ONLINE:
+                                            remote_devices = storage_node_ops._connect_to_remote_devs(node)
+                                            n = db_controller.get_storage_node_by_id(node.get_id())
+                                            n.remote_devices = remote_devices
+                                            n.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.27 → sbcli_hmdi-0.0.30}/simplyblock_core/distr_controller.py

@@ -42,7 +42,7 @@ def send_dev_status_event(device, status, target_node=None):
     db_controller = DBController()
     storage_ID = device.cluster_device_order
     if target_node:
-        snodes = [target_node]
+        snodes = [db_controller.get_storage_node_by_id(target_node.get_id())]
     else:
         snodes = db_controller.get_storage_nodes_by_cluster_id(device.cluster_id)
     for node in snodes:
@@ -54,12 +54,13 @@ def send_dev_status_event(device, status, target_node=None):
         if node.get_id() != device.node_id:
             rem_dev = None
             for dev2 in node.remote_devices:
-                if dev2.get_id() == device.get_id() and dev2.status == NVMeDevice.STATUS_ONLINE:
+                if dev2.get_id() == device.get_id() :
                     rem_dev = dev2
                     break
 
             if not rem_dev and status == NVMeDevice.STATUS_ONLINE:
                 dev_status = NVMeDevice.STATUS_UNAVAILABLE
+                logger.warning(f"Device is not connected to node, dev: {device.get_id()}, node: {node.get_id()}")
 
         events = {"events": [{
             "timestamp": datetime.datetime.now().isoformat("T", "seconds") + 'Z',

{sbcli_hmdi-0.0.27 → sbcli_hmdi-0.0.30}/simplyblock_core/env_var

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

{sbcli_hmdi-0.0.27 → sbcli_hmdi-0.0.30}/simplyblock_core/services/device_monitor.py

@@ -31,7 +31,7 @@ while True:
             if dev.status == NVMeDevice.STATUS_ONLINE:
                 online_devices.append(dev)
 
-            if dev.io_error and dev.status == NVMeDevice.STATUS_UNAVAILABLE and not dev.retries_exhausted:
+            if dev.status == NVMeDevice.STATUS_UNAVAILABLE and not dev.retries_exhausted:
                 logger.info("Adding device to auto restart")
                 auto_restart_devices.append(dev)
 

{sbcli_hmdi-0.0.27 → sbcli_hmdi-0.0.30}/simplyblock_core/services/main_distr_event_collector.py

@@ -71,7 +71,8 @@ def process_device_event(event):
             event.status = 'skipped:node_offline'
             return
 
-        if device_node_obj.get_id() != event_node_obj.get_id() and event.message == 'error_open':
+        if device_node_obj.get_id() != event_node_obj.get_id() and event.message in ['error_open', 'SPDK_BDEV_EVENT_REMOVE']:
+            event_node_obj = db_controller.get_storage_node_by_id(event_node_obj.get_id())
             for dev in event_node_obj.remote_devices:
                 if dev.get_id() == device_obj.get_id():
                     dev.status = NVMeDevice.STATUS_UNAVAILABLE