sbcli-dev 4.0.5__zip → 4.0.6__zip

{sbcli_dev-4.0.5 → sbcli_dev-4.0.6}/PKG-INFO

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

{sbcli_dev-4.0.5 → sbcli_dev-4.0.6}/env_var

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

{sbcli_dev-4.0.5 → sbcli_dev-4.0.6}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.5 → sbcli_dev-4.0.6}/simplyblock_core/controllers/device_controller.py

@@ -672,7 +672,7 @@ def add_device(device_id):
     if snode.jm_device and snode.jm_device.raid_bdev:
         # 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"
+        jm_dev_part = f"{dev.nvme_bdev[:-2]}p1"
         ret = rpc_client.get_bdevs(jm_dev_part)
         if ret:
             logger.info(f"JM part found: {jm_dev_part}")
@@ -714,6 +714,10 @@ def set_jm_device_state(device_id, state):
         for node_index, node in enumerate(snodes):
             if node.get_id() == snode.get_id() or node.status != StorageNode.STATUS_ONLINE:
                 continue
+            for jm_dev in node.remote_jm_devices:
+                if jm_dev.get_id() == device_id and jm_device.status != JMDevice.STATUS_ONLINE:
+                    node.remote_jm_devices.remove(jm_dev)
+                    break
             logger.info(f"Connecting to node: {node.get_id()}")
             node.remote_jm_devices = storage_node_ops._connect_to_remote_jm_devs(node)
             node.write_to_db(db_controller.kv_store)
@@ -796,7 +800,7 @@ def restart_jm_device(device_id, force=False):
         for dev in snode.nvme_devices:
             if dev.status != NVMeDevice.STATUS_ONLINE:
                 continue
-            dev_part = f"{dev.nvme_bdev[:-1]}1"
+            dev_part = f"{dev.nvme_bdev[:-2]}p1"
             if dev_part in bdevs_names:
                 if dev_part not in jm_nvme_bdevs:
                     jm_nvme_bdevs.append(dev_part)

{sbcli_dev-4.0.5 → sbcli_dev-4.0.6}/simplyblock_core/storage_node_ops.py

@@ -798,16 +798,24 @@ def _connect_to_remote_jm_devs(this_node, jm_ids=[]):
     if jm_ids:
         for jm_id in jm_ids:
             jm_dev = db_controller.get_jm_device_by_id(jm_id)
-            remote_devices.append(jm_dev)
+            if jm_dev:
+                remote_devices.append(jm_dev)
     elif len(this_node.remote_jm_devices) > 0:
         remote_devices = this_node.remote_jm_devices
     else:
         for node in db_controller.get_storage_nodes_by_cluster_id(this_node.cluster_id):
             if node.get_id() == this_node.get_id() or node.status != StorageNode.STATUS_ONLINE:
                 continue
-            if node.jm_device:
+            if node.jm_device and node.jm_device.status == JMDevice.STATUS_ONLINE:
                 remote_devices.append(node.jm_device)
 
+    if len(remote_devices) < 2:
+        online_jms = get_next_ha_jms(this_node)
+        for jm_id in online_jms:
+            jm_dev = db_controller.get_jm_device_by_id(jm_id)
+            if jm_dev:
+                remote_devices.append(jm_dev)
+
     for jm_dev in remote_devices:
         name = f"remote_{jm_dev.jm_bdev}"
         bdev_name = f"{name}n1"
@@ -1354,6 +1362,10 @@ def remove_storage_node(node_id, force_remove=False, force_migrate=False):
                 distr_controller.disconnect_device(dev)
             device_controller.device_set_failed(dev.get_id())
 
+    if snode.jm_device:
+        logger.info("Removing JM")
+        device_controller.remove_jm_device(snode.jm_device.get_id(), force=True)
+
     logger.info("Removing storage node")
 
     logger.debug("Leaving swarm...")
@@ -1687,6 +1699,7 @@ def restart_storage_node(
 
     if snode.enable_ha_jm:
         logger.info("Connecting to remote JMs")
+        snode.remote_jm_devices = []
         snode.remote_jm_devices = _connect_to_remote_jm_devs(snode)
 
     logger.info("Setting node status to Online")
@@ -1714,6 +1727,9 @@ def restart_storage_node(
             continue
         tasks_controller.add_device_mig_task(dev.get_id())
 
+    if cluster.status == cluster.STATUS_UNREADY:
+        logger.info("Done")
+        return "Success"
     # Create distribs, raid0, and lvstore and expose lvols to the fabrics
     if snode.lvstore_stack:
         temp_rpc_client = RPCClient(
@@ -2562,12 +2578,15 @@ def get_next_ha_jms(current_node):
     for node in db_controller.get_storage_nodes_by_cluster_id(current_node.cluster_id):
         if node.get_id() == current_node.get_id() or node.status != StorageNode.STATUS_ONLINE:
             continue
-        if node.jm_device:
+        if node.jm_device and node.jm_device.status == JMDevice.STATUS_ONLINE:
             jm_count[node.jm_device.get_id()] = 1 + jm_count.get(node.jm_device.get_id(), 0)
         for rem_jm_device in node.remote_jm_devices:
             if rem_jm_device.get_id() != current_node.jm_device.get_id():
-                jm_count[rem_jm_device.get_id()] = 1 + jm_count.get(rem_jm_device.get_id(), 0)
-
+                try:
+                    if db_controller.get_jm_device_by_id(rem_jm_device.get_id()).status == JMDevice.STATUS_ONLINE:
+                        jm_count[rem_jm_device.get_id()] = 1 + jm_count.get(rem_jm_device.get_id(), 0)
+                except :
+                    pass
     jm_count = dict(sorted(jm_count.items(), key=lambda x: x[1]))
     return list(jm_count.keys())[:2]
 
@@ -2597,6 +2616,7 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
     if snode.enable_ha_jm:
         jm_vuid = utils.get_random_vuid()
         online_jms = get_next_ha_jms(snode)
+        logger.debug(f"online_jms: {str(online_jms)}")
         snode.remote_jm_devices = _connect_to_remote_jm_devs(snode, online_jms)
         snode.write_to_db()