sbcli-dev 3.8.41__zip → 3.8.43__zip

{sbcli_dev-3.8.41 → sbcli_dev-3.8.43}/PKG-INFO

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

{sbcli_dev-3.8.41 → sbcli_dev-3.8.43}/env_var

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

{sbcli_dev-3.8.41 → sbcli_dev-3.8.43}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.41 → sbcli_dev-3.8.43}/simplyblock_core/constants.py

@@ -59,7 +59,7 @@ TASK_EXEC_RETRY_COUNT = 8
 
 SIMPLY_BLOCK_SPDK_CORE_IMAGE = "simplyblock/spdk-core:latest"
 SIMPLY_BLOCK_SPDK_CORE_IMAGE_ARM64 = "simplyblock/spdk-core:latest-arm64"
-SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:348-temp-migration-2-latest"
+SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:main-latest"
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE_JM = "simplyblock/spdk:feature-journal-ha-latest"
 
 GELF_PORT = 12201

{sbcli_dev-3.8.41 → sbcli_dev-3.8.43}/simplyblock_core/distr_controller.py

@@ -74,7 +74,8 @@ def disconnect_device(device):
 def get_distr_cluster_map(snodes, target_node):
     map_cluster = {}
     map_prob = []
-    for snode in snodes:
+    local_node_index = 0
+    for index, snode in enumerate(snodes):
         dev_map = {}
         dev_w_map = []
         node_w = 0
@@ -88,6 +89,7 @@ def get_distr_cluster_map(snodes, target_node):
             if snode.get_id() == target_node.get_id():
                 name = dev.alceml_bdev
                 dev_status = dev.status
+                local_node_index = index
             else:
                 for dev2 in target_node.remote_devices:
                     if dev2.get_id() == dev.get_id():
@@ -118,7 +120,8 @@ def get_distr_cluster_map(snodes, target_node):
         "UUID_node_target": "",
         "timestamp": datetime.datetime.now().isoformat("T", "seconds")+'Z',
         "map_cluster": map_cluster,
-        "map_prob": map_prob
+        "map_prob": map_prob,
+        'ppln1': local_node_index
     }
     return cl_map
 

{sbcli_dev-3.8.41 → sbcli_dev-3.8.43}/simplyblock_core/rpc_client.py

@@ -385,10 +385,11 @@ class RPCClient:
             "block_size": block_size,
             "chunk_size": chunk_size,
             "pba_page_size": pba_page_size,
-            "ha_is_non_leader": ha_is_non_leader,
         }
         if jm_vuid > 0:
             params["jm_vuid"] = jm_vuid
+            params["ha_is_non_leader"] = ha_is_non_leader
+
         if ha_comm_addrs:
             params['ha_comm_addrs'] = ha_comm_addrs
             params['ha_inode_self'] = ha_inode_self

{sbcli_dev-3.8.41 → sbcli_dev-3.8.43}/simplyblock_core/services/main_distr_event_collector.py

@@ -3,7 +3,7 @@ import threading
 import time
 
 
-from simplyblock_core import constants, kv_store, utils, rpc_client
+from simplyblock_core import constants, kv_store, utils, rpc_client, distr_controller
 from simplyblock_core.controllers import events_controller, device_controller, lvol_events
 from simplyblock_core.models.lvol_model import LVol
 
@@ -25,7 +25,6 @@ def process_device_event(event):
         storage_id = event.storage_id
 
         device = None
-        device_node = None
         for node in db_controller.get_storage_nodes():
             for dev in node.nvme_devices:
                 if dev.cluster_device_order == storage_id:
@@ -35,7 +34,6 @@ def process_device_event(event):
                         return
 
                     device = dev
-                    device_node = node
                     break
 
         if not device:
@@ -44,32 +42,36 @@ def process_device_event(event):
             return
 
         device_id = device.get_id()
-        if event.message == 'SPDK_BDEV_EVENT_REMOVE':
-            if device.node_id == node_id:
-                logger.info(f"Removing storage id: {storage_id} from node: {node_id}")
-                device_controller.device_remove(device_id)
-            else:
-                logger.info(f"Removing remote storage id: {storage_id} from node: {node_id}")
-                new_remote_devices = []
-                rpc_client = RPCClient(device_node.mgmt_ip, device_node.rpc_port,
-                                       device_node.rpc_username, device_node.rpc_password)
-                for rem_dev in device_node.remote_devices:
-                    if rem_dev.get_id() == device.get_id():
-                        ctrl_name = rem_dev.remote_bdev[:-2]
-                        rpc_client.bdev_nvme_detach_controller(ctrl_name)
-                    else:
-                        new_remote_devices.append(rem_dev)
-                device_node.remote_devices = new_remote_devices
-                device_node.write_to_db(db_controller.kv_store)
-
-        elif event.message in ['error_write', 'error_unmap']:
-            logger.info(f"Setting device to read-only")
-            device_controller.device_set_io_error(device_id, True)
-            device_controller.device_set_read_only(device_id)
+        node = db_controller.get_storage_node_by_id(node_id)
+        if device.node_id != node_id:
+            logger.info(f"Removing remote storage id: {storage_id} from node: {node_id}")
+            new_remote_devices = []
+            rpc_client = RPCClient(node.mgmt_ip, node.rpc_port,
+                                   node.rpc_username, node.rpc_password)
+            for rem_dev in node.remote_devices:
+                if rem_dev.get_id() == device.get_id():
+                    ctrl_name = rem_dev.remote_bdev[:-2]
+                    rpc_client.bdev_nvme_detach_controller(ctrl_name)
+                else:
+                    new_remote_devices.append(rem_dev)
+            node.remote_devices = new_remote_devices
+            node.write_to_db(db_controller.kv_store)
+            distr_controller.send_cluster_map_to_node(node)
+
         else:
-            logger.info(f"Setting device to unavailable")
-            device_controller.device_set_io_error(device_id, True)
-            device_controller.device_set_unavailable(device_id)
+            if event.message == 'SPDK_BDEV_EVENT_REMOVE':
+                if device.node_id == node_id:
+                    logger.info(f"Removing storage id: {storage_id} from node: {node_id}")
+                    device_controller.device_remove(device_id)
+
+            elif event.message in ['error_write', 'error_unmap']:
+                logger.info(f"Setting device to read-only")
+                device_controller.device_set_io_error(device_id, True)
+                device_controller.device_set_read_only(device_id)
+            else:
+                logger.info(f"Setting device to unavailable")
+                device_controller.device_set_io_error(device_id, True)
+                device_controller.device_set_unavailable(device_id)
 
         event.status = 'processed'
 

{sbcli_dev-3.8.41 → sbcli_dev-3.8.43}/simplyblock_core/storage_node_ops.py

@@ -2678,7 +2678,7 @@ def _create_bdev_stack(snode, lvstore_stack=None):
         else:
             if created_bdevs:
                 # rollback
-                _remove_bdev_stack(created_bdevs, rpc_client)
+                _remove_bdev_stack(created_bdevs[::-1], rpc_client)
             return False, f"Failed to create BDev: {name}"
 
     return True, None