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

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

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

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

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

{sbcli_hmdi-0.0.25 → sbcli_hmdi-0.0.27}/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:
+                                        #     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.25 → sbcli_hmdi-0.0.27}/simplyblock_core/env_var

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

{sbcli_hmdi-0.0.25 → sbcli_hmdi-0.0.27}/simplyblock_core/services/health_check_service.py

@@ -136,9 +136,14 @@ while True:
                                 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()
+                                sn = db_controller.get_storage_node_by_id(snode.get_id())
+                                for d in sn.remote_devices:
+                                    if d.get_id() == remote_device.get_id():
+                                        d.status = NVMeDevice.STATUS_ONLINE
+                                        sn.write_to_db()
+                                        break
+
                                 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()}")

{sbcli_hmdi-0.0.25 → sbcli_hmdi-0.0.27}/simplyblock_core/storage_node_ops.py

@@ -1912,7 +1912,7 @@ def restart_storage_node(
     logger.info("Setting node status to Online")
     set_node_status(node_id, StorageNode.STATUS_ONLINE)
 
-    time.sleep(1)
+    # time.sleep(1)
     snode = db_controller.get_storage_node_by_id(snode.get_id())
     for db_dev in snode.nvme_devices:
         if db_dev.status in [NVMeDevice.STATUS_UNAVAILABLE, NVMeDevice.STATUS_READONLY, NVMeDevice.STATUS_ONLINE]:
@@ -1929,15 +1929,18 @@ def restart_storage_node(
         node.remote_devices = _connect_to_remote_devs(node)
         node.write_to_db(kv_store)
 
+    time.sleep(1)
+    snode = db_controller.get_storage_node_by_id(snode.get_id())
+    for db_dev in snode.nvme_devices:
+        distr_controller.send_dev_status_event(db_dev, db_dev.status)
+
     time.sleep(1)
     if snode.jm_device and snode.jm_device.status in [JMDevice.STATUS_UNAVAILABLE, JMDevice.STATUS_ONLINE]:
         device_controller.set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_ONLINE)
 
-    time.sleep(1)
-    for db_dev in snode.nvme_devices:
-        distr_controller.send_dev_status_event(db_dev, db_dev.status)
 
     time.sleep(1)
+    cluster = db_controller.get_cluster_by_id(snode.cluster_id)
     if cluster.status in [Cluster.STATUS_ACTIVE, Cluster.STATUS_DEGRADED]:
         if snode.lvstore_stack or snode.is_secondary_node:
             ret = recreate_lvstore(snode)