sbcli-dev 10.3.4__tar.gz → 10.3.6__tar.gz

{sbcli_dev-10.3.4 → sbcli_dev-10.3.6}/PKG-INFO

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

{sbcli_dev-10.3.4 → sbcli_dev-10.3.6}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.3.4 → sbcli_dev-10.3.6}/simplyblock_core/distr_controller.py

@@ -140,6 +140,12 @@ def get_distr_cluster_map(snodes, target_node, distr_name=""):
         "map_prob": [d for k, d in map_prob.items()]
     }
     if cluster.enable_node_affinity:
+        if target_node.is_secondary_node and distr_name:
+            for index, snode in enumerate(snodes):
+                for bdev in snode.lvstore_stack:
+                    if bdev['type'] == "bdev_distr" and bdev['name'] == distr_name:
+                        local_node_index = index
+                        break
         cl_map['ppln1'] = local_node_index
     return cl_map
 
@@ -208,14 +214,25 @@ def send_cluster_map_to_node(node):
     db_controller = DBController()
     snodes = db_controller.get_storage_nodes_by_cluster_id(node.cluster_id)
     rpc_client = RPCClient(node.mgmt_ip, node.rpc_port, node.rpc_username, node.rpc_password, timeout=10)
-    cluster_map_data = get_distr_cluster_map(snodes, node)
-    cluster_map_data['UUID_node_target'] = node.get_id()
-    ret = rpc_client.distr_send_cluster_map(cluster_map_data)
-    if not ret:
-        logger.error("Failed to send cluster map")
-        logger.info(cluster_map_data)
-        return False
-    return True
+
+    if node.is_secondary_node:
+        for snode in db_controller.get_primary_storage_nodes_by_secondary_node_id(node.get_id()):
+            for bdev in snode.lvstore_stack:
+                if bdev['type'] == "bdev_distr":
+                    cluster_map_data = get_distr_cluster_map(snodes, node, bdev["name"])
+                    ret = rpc_client.distr_send_cluster_map(cluster_map_data)
+                    if not ret:
+                        logger.error("Failed to send cluster map")
+                        return False
+        return True
+    else:
+        cluster_map_data = get_distr_cluster_map(snodes, node)
+        ret = rpc_client.distr_send_cluster_map(cluster_map_data)
+        if not ret:
+            logger.error("Failed to send cluster map")
+            logger.info(cluster_map_data)
+            return False
+        return True
 
 
 def send_cluster_map_to_distr(node, distr_name):

{sbcli_dev-10.3.4 → sbcli_dev-10.3.6}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=10.3.4
+SIMPLY_BLOCK_VERSION=10.3.6
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main
 DOCKER_USER=hamdysimplyblock

{sbcli_dev-10.3.4 → sbcli_dev-10.3.6}/simplyblock_core/storage_node_ops.py

@@ -2845,7 +2845,6 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
             distrib_vuid = utils.get_random_vuid()
 
         distrib_name = f"distrib_{distrib_vuid}"
-        lvs_name = f"LVS_{distrib_vuid}"
         lvstore_stack.extend(
             [
                 {
@@ -2904,18 +2903,16 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
         }
     )
 
-    ret, err = _create_bdev_stack(snode, lvstore_stack)
-    if err:
-        logger.error(f"Failed to create lvstore on node {snode.get_id()}")
-        logger.error(err)
-        return False
-
     snode.lvstore = lvs_name
     snode.lvstore_stack = lvstore_stack
     snode.raid = raid_device
     snode.write_to_db()
 
-    # time.sleep(1)
+    ret, err = _create_bdev_stack(snode, lvstore_stack)
+    if err:
+        logger.error(f"Failed to create lvstore on node {snode.get_id()}")
+        logger.error(err)
+        return False
 
     if snode.secondary_node_id:
         # creating lvstore on secondary

{sbcli_dev-10.3.4 → sbcli_dev-10.3.6}/simplyblock_core/utils.py

@@ -664,6 +664,9 @@ def strfdelta(tdelta):
 
 def handle_task_result(task: JobSchedule, res: dict, allowed_error_codes = None):
     if res:
+        if not allowed_error_codes:
+            allowed_error_codes = [0]
+
         res_data = res[0]
         migration_status = res_data.get("status")
         error_code = res_data.get("error", -1)