sbcli-dev 17.4.0__tar.gz → 17.4.2__tar.gz

{sbcli_dev-17.4.0 → sbcli_dev-17.4.2}/PKG-INFO

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

{sbcli_dev-17.4.0 → sbcli_dev-17.4.2}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-17.4.0 → sbcli_dev-17.4.2}/simplyblock_cli/clibase.py

@@ -271,7 +271,7 @@ class CLIWrapperBase:
         return storage_ops.dump_lvstore(node_id)
 
     def storage_node__set(self, sub_command, args):
-        return storage_ops.set(args.node_id, args.attr_name, args.attr_value)
+        return storage_ops.set_value(args.node_id, args.attr_name, args.attr_value)
 
     def cluster__deploy(self, sub_command, args):
         return self.cluster_deploy(args)

{sbcli_dev-17.4.0 → sbcli_dev-17.4.2}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=17.4.0
+SIMPLY_BLOCK_VERSION=17.4.2
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=public.ecr.aws/simply-block/ultra:main-latest

{sbcli_dev-17.4.0 → sbcli_dev-17.4.2}/simplyblock_core/storage_node_ops.py

@@ -906,8 +906,26 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
 
     poller_cpu_cores = []
 
-    if not spdk_cpu_mask:
-        spdk_cpu_mask = cores_config["cpu_mask"]
+    if spdk_cpu_mask:
+        pass
+    else:
+        total_spdk_cpu_mask = cores_config["cpu_mask"]
+        total_spdk_cores = utils.hexa_to_cpu_list(total_spdk_cpu_mask)
+        used_cores = []
+        for core in total_spdk_cores:
+            for node in db_controller.get_storage_nodes_by_cluster_id(cluster_id):
+                if node.api_endpoint == node_ip:
+                    if core in utils.hexa_to_cpu_list(node.spdk_cpu_mask):
+                        used_cores.append(core)
+                        break
+
+        free_cores = list(set(total_spdk_cores) - set(used_cores))
+        if len(free_cores) >= spdk_cpu_count:
+            spdk_cpu_mask = utils.generate_mask(free_cores[:spdk_cpu_count])
+        else:
+            logger.error("No more CPU cores available")
+            return False
+
     spdk_cores = utils.hexa_to_cpu_list(spdk_cpu_mask)
     req_cpu_count = len(spdk_cores)
     if cpu_count < req_cpu_count:
@@ -998,6 +1016,14 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
             f"Not enough memory for the provided max_lvo: {max_lvol}, max_snap: {max_snap}, max_prov: {max_prov}.. Exiting")
         # return False
 
+    if ssd_pcie:
+        for ssd in ssd_pcie:
+            for node in db_controller.get_storage_nodes_by_cluster_id(cluster_id):
+                if node.api_endpoint == node_ip:
+                    if ssd in node.ssd_pcie:
+                        logger.error(f"SSD is being used by other node, ssd: {ssd}, node: {node.get_id()}")
+                        return False
+
     logger.info("Joining docker swarm...")
     cluster_docker = utils.get_docker_client(cluster_id)
     cluster_ip = cluster_docker.info()["Swarm"]["NodeAddr"]
@@ -3047,14 +3073,18 @@ def get_sorted_ha_jms(current_node):
         if node.mgmt_ip == current_node.mgmt_ip:
             continue
         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():
-                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[node.jm_device.get_id()] = 1
+
+    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 or
+                node.is_secondary_node):  # pass
+            continue
+        if node.mgmt_ip == current_node.mgmt_ip or not node.jm_ids:
+            continue
+        for rem_jm_id in node.jm_ids:
+            if rem_jm_id in jm_count:
+                jm_count[rem_jm_id] += 1
+
     jm_count = dict(sorted(jm_count.items(), key=lambda x: x[1]))
     return list(jm_count.keys())[:3]
 
@@ -3446,7 +3476,7 @@ def dump_lvstore(node_id):
     return True
 
 
-def set(node_id, attr, value):
+def set_value(node_id, attr, value):
     db_controller = DBController()
 
     snode = db_controller.get_storage_node_by_id(node_id)