sbcli-dev 5.1.7__tar.gz → 5.1.9__tar.gz

{sbcli_dev-5.1.7 → sbcli_dev-5.1.9}/PKG-INFO

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

{sbcli_dev-5.1.7 → sbcli_dev-5.1.9}/env_var

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

{sbcli_dev-5.1.7 → sbcli_dev-5.1.9}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-5.1.7 → sbcli_dev-5.1.9}/simplyblock_core/controllers/lvol_controller.py

@@ -219,7 +219,7 @@ def _get_next_3_nodes(cluster_id, lvol_size=0):
     print("Node stats")
     utils.print_table_dict({**node_stats, "Cluster": cluster_stats})
     print("Node weights")
-    utils.print_table_dict({**nodes_weight, "weights": {**constants.weights, "total": sum(constants.weights.values())}})
+    utils.print_table_dict({**nodes_weight, "weights": {"lvol": n_start, "total": n_start}})
     print("Node selection range")
     utils.print_table_dict(node_start_end)
     #############
@@ -232,6 +232,19 @@ def _get_next_3_nodes(cluster_id, lvol_size=0):
             if node_start_end[node_id]['start'] <= r_index <= node_start_end[node_id]['end']:
                 if node_id not in selected_node_ids:
                     selected_node_ids.append(node_id)
+
+                    node_start_end = {}
+                    n_start = 0
+                    for node in nodes_weight:
+                        if node in selected_node_ids:
+                            continue
+                        node_start_end[node] = {
+                            "weight": nodes_weight[node]['total'],
+                            "start": n_start,
+                            "end": n_start + nodes_weight[node]['total'],
+                        }
+                        n_start = node_start_end[node]['end']
+
                     break
 
     ret = []

{sbcli_dev-5.1.7 → sbcli_dev-5.1.9}/simplyblock_core/controllers/snapshot_controller.py

@@ -319,7 +319,7 @@ def clone(snapshot_id, clone_name, new_size=0):
             ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
 
     logger.info(f"add lvol {clone_name} to subsystem")
-    ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, lvol.top_bdev)
+    ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, lvol.top_bdev, lvol.uuid, lvol.guid)
     if not ret:
         return False, "Failed to add bdev to subsystem"
 

{sbcli_dev-5.1.7 → sbcli_dev-5.1.9}/simplyblock_core/utils.py

@@ -181,9 +181,9 @@ def get_weights(node_stats, cluster_stats):
     def _get_key_w(node_id, key):
         w = 0
         if cluster_stats[key] > 0:
-            w = (node_stats[node_id][key] / cluster_stats[key]) * 100
-            if key in ["lvol", "r_io", "w_io", "r_b", "w_b"]:  # get reverse value
-                w = ((cluster_stats[key]-node_stats[node_id][key]) / cluster_stats[key]) * 100
+            w = (cluster_stats[key]/node_stats[node_id][key])*10
+            # if key in ["lvol", "r_io", "w_io", "r_b", "w_b"]:  # get reverse value
+            #     w = (cluster_stats[key]/node_stats[node_id][key]) * 100
         return w
 
     out = {}