sbcli-dev 3.8.66__zip → 3.8.68__zip

{sbcli_dev-3.8.66 → sbcli_dev-3.8.68}/PKG-INFO

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

{sbcli_dev-3.8.66 → sbcli_dev-3.8.68}/env_var

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

{sbcli_dev-3.8.66 → sbcli_dev-3.8.68}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.66 → sbcli_dev-3.8.68}/simplyblock_core/controllers/device_controller.py

@@ -252,19 +252,20 @@ def restart_device(device_id, force=False):
 
     # add to jm raid
     if snode.jm_device and snode.jm_device.raid_bdev:
-        nvme_controller = device_obj.nvme_controller
-        jm_part = None
-        for part in snode.jm_device.jm_nvme_bdev_list:
-            if part.startswith(nvme_controller):
-                jm_part = part
-                break
-
-        if not jm_part:
-            if snode.jm_device.status == NVMeDevice.STATUS_ONLINE:
+        # looking for jm partition
+        rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
+        jm_dev_part = f"{dev.nvme_bdev[:-1]}1"
+        ret = rpc_client.get_bdevs(jm_dev_part)
+        if ret:
+            logger.info(f"JM part found: {jm_dev_part}")
+            if snode.jm_device.status == JMDevice.STATUS_UNAVAILABLE:
+                restart_jm_device(snode.jm_device.get_id(), force=True)
+
+            if snode.jm_device.status == JMDevice.STATUS_ONLINE and \
+                    jm_dev_part not in snode.jm_device.jm_nvme_bdev_list:
                 remove_jm_device(snode.jm_device.get_id(), force=True)
                 time.sleep(3)
-
-            restart_jm_device(snode.jm_device.get_id(), force=True)
+                restart_jm_device(snode.jm_device.get_id(), force=True)
 
     return "Done"
 
@@ -718,15 +719,12 @@ def set_jm_device_state(device_id, state):
         logger.error("device not found")
         return False
 
-    if jm_device.status == state:
-        return True
-
-    jm_device.status = state
-    snode.write_to_db(db_controller.kv_store)
+    if jm_device.status != state:
+        jm_device.status = state
+        snode.write_to_db(db_controller.kv_store)
 
     if snode.enable_ha_jm and state in [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_UNAVAILABLE]:
         # make other nodes connect to the new devices
-        logger.info("Make other nodes connect to the new devices")
         snodes = db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id)
         for node_index, node in enumerate(snodes):
             if node.get_id() == snode.get_id() or node.status != StorageNode.STATUS_ONLINE: