sbcli-dev 3.8.85__zip → 3.8.86__zip

{sbcli_dev-3.8.85 → sbcli_dev-3.8.86}/PKG-INFO

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

{sbcli_dev-3.8.85 → sbcli_dev-3.8.86}/env_var

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

{sbcli_dev-3.8.85 → sbcli_dev-3.8.86}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.85 → sbcli_dev-3.8.86}/simplyblock_core/models/storage_node.py

@@ -91,6 +91,8 @@ class StorageNode(BaseModel):
         "alceml_cpu_index": {"type": int, "default": 0},
         "alceml_worker_cpu_index": {"type": int, "default": 0},
         "distrib_cpu_index": {"type": int, "default": 0},
+        "jc_singleton_mask": {"type": int, "default": 0},
+
 
         "distrib_cpu_mask": {"type": str, "default": ""},
 

{sbcli_dev-3.8.85 → sbcli_dev-3.8.86}/simplyblock_core/rpc_client.py

@@ -728,6 +728,11 @@ class RPCClient:
         params = {"poll_groups_mask": poll_groups_mask}
         return self._request("nvmf_set_config", params)
 
+    def jc_set_hint_lcpu_mask(self, jc_singleton_mask):
+        params = {"hint_lcpu_mask": int(jc_singleton_mask, 16)}
+        return self._request("jc_set_hint_lcpu_mask", params)
+
+
     def thread_get_stats(self):
         return self._request("thread_get_stats")
 

{sbcli_dev-3.8.85 → sbcli_dev-3.8.86}/simplyblock_core/storage_node_ops.py

@@ -578,10 +578,13 @@ def _prepare_cluster_devices_partitions(snode, devices):
             if not new_device:
                 logger.error("failed to create dev stack")
                 return False
-            new_device.cluster_device_order = dev_order
-            dev_order += 1
+            if nvme.status == NVMeDevice.STATUS_NEW:
+                new_device.status = NVMeDevice.STATUS_NEW
+            else:
+                new_device.cluster_device_order = dev_order
+                dev_order += 1
+                device_events.device_create(new_device)
             new_devices.append(new_device)
-            device_events.device_create(new_device)
 
     snode.nvme_devices = new_devices
 
@@ -877,6 +880,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
     alceml_worker_cpu_index = 0
     distrib_cpu_index = 0
 
+
     poller_cpu_cores = []
 
     if not spdk_cpu_mask:
@@ -890,11 +894,13 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
         print(f"ERROR: The provided cpu mask {spdk_cpu_mask} has values greater than 63, which is not allowed")
         return False
     if len(spdk_cores) >= 4:
-        app_thread_core, jm_cpu_core, poller_cpu_cores, alceml_cpu_cores, alceml_worker_cpu_cores, distrib_cpu_cores = utils.calculate_core_allocation(
+        app_thread_core, jm_cpu_core, poller_cpu_cores, alceml_cpu_cores, alceml_worker_cpu_cores, distrib_cpu_cores, jc_singleton_core = utils.calculate_core_allocation(
             spdk_cores)
 
         pollers_mask = utils.generate_mask(poller_cpu_cores)
         app_thread_mask = utils.generate_mask(app_thread_core)
+        if jc_singleton_core:
+            jc_singleton_mask = utils.decimal_to_hex_power_of_2(jc_singleton_core[0])
         #spdk_cpu_mask = utils.generate_mask(spdk_cores)
         jm_cpu_mask = utils.generate_mask(jm_cpu_core)
         #distrib_cpu_mask = utils.generate_mask(distrib_cpu_cores)
@@ -1057,6 +1063,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
     snode.alceml_cpu_cores = alceml_cpu_cores
     snode.alceml_worker_cpu_cores = alceml_worker_cpu_cores
     snode.distrib_cpu_cores = distrib_cpu_cores
+    snode.jc_singleton_mask = jc_singleton_mask or 0
 
     snode.poller_cpu_cores = poller_cpu_cores or []
 
@@ -1127,6 +1134,13 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
         logger.error("Failed to set nvme options")
         return False
 
+    # 7- set jc singleton mask
+    if snode.jc_singleton_mask:
+        ret = rpc_client.jc_set_hint_lcpu_mask(snode.jc_singleton_mask)
+        if not ret:
+            logger.error("Failed to set jc singleton mask")
+            return False
+
     # get new node info after starting spdk
     node_info, _ = snode_api.info()
 
@@ -1563,6 +1577,13 @@ def restart_storage_node(
         logger.error("Failed to set nvme options")
         return False
 
+    # 7- set jc singleton mask
+    if snode.jc_singleton_mask:
+        ret = rpc_client.jc_set_hint_lcpu_mask(snode.jc_singleton_mask)
+        if not ret:
+            logger.error("Failed to set jc singleton mask")
+            return False
+
     node_info, _ = snode_api.info()
     nvme_devs = addNvmeDevices(snode, node_info['spdk_pcie_list'])
     if not nvme_devs:
@@ -2500,6 +2521,31 @@ def recreate_lvstore(snode):
     return True
 
 
+def get_next_ha_jm_names(current_node):
+    db_controller = DBController(KVStore())
+    jm_list = []
+    if current_node.jm_device:
+        jm_list.append(current_node.jm_device.jm_bdev)
+    else:
+        jm_list.append("JM_LOCAL")
+
+    jm_count = {}
+    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:
+            jm_count[node.jm_device.jm_bdev] = 1 + jm_count.get(node.jm_device.jm_bdev, 0)
+        for rem_jm_device in node.remote_jm_devices:
+            jm_count[rem_jm_device.jm_bdev] = 1 + jm_count.get(rem_jm_device.jm_bdev, 0)
+
+    jm_count = dict(sorted(jm_count.items(), key=lambda x: x[1]))
+
+    jm_list.append(f"remote_{list(jm_count.keys())[0].jm_bdev}n1")
+    jm_list.append(f"remote_{list(jm_count.keys())[1].jm_bdev}n1")
+
+    return jm_list
+
+
 def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blocks, max_size, nodes):
     lvstore_stack = []
     distrib_list = []

{sbcli_dev-3.8.85 → sbcli_dev-3.8.86}/simplyblock_core/utils.py

@@ -350,59 +350,67 @@ def calculate_core_allocation(cpu_cores):
     if len(cpu_cores) == 23:
         app_thread_core = [cpu_cores[pos - 1] for pos in [16]]
         jm_cpu_core = [cpu_cores[pos - 1] for pos in [17, 22]]
-        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [6, 7, 8, 14, 15, 18, 19, 20, 23]]
+        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [6, 7, 8, 14, 15, 18, 19, 20]]
         alceml_cpu_cores = [cpu_cores[pos - 1] for pos in [1, 2, 3]]
         alceml_cpu_worker_cores = [cpu_cores[pos - 1] for pos in [13, 21]]
         distrib_cpu_cores = [cpu_cores[pos - 1] for pos in [4, 5, 9, 10, 11, 12]]
+        jc_singleton_core = [cpu_cores[pos - 1] for pos in [23]]
     elif len(cpu_cores) == 21:
         app_thread_core = [cpu_cores[pos - 1] for pos in [14]]
         jm_cpu_core = [cpu_cores[pos - 1] for pos in [15, 21]]
-        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [4, 5, 6, 7, 13, 16, 17, 18]]
+        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [4, 5, 6, 7, 13, 16, 17]]
         alceml_cpu_cores = [cpu_cores[pos - 1] for pos in [1, 2]]
         alceml_cpu_worker_cores = [cpu_cores[pos - 1] for pos in [12, 20]]
         distrib_cpu_cores = [cpu_cores[pos - 1] for pos in [3, 8, 9, 10, 11, 19]]
+        jc_singleton_core = [cpu_cores[pos - 1] for pos in [18]]
     elif len(cpu_cores) == 19:
         app_thread_core = [cpu_cores[pos - 1] for pos in [13]]
         jm_cpu_core = [cpu_cores[pos - 1] for pos in [14]]
-        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [5, 6, 7, 12, 15, 16, 17]]
+        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [5, 6, 7, 12, 15, 16]]
         alceml_cpu_cores = [cpu_cores[pos - 1] for pos in [1, 2]]
         alceml_cpu_worker_cores = [cpu_cores[pos - 1] for pos in [11, 19]]
         distrib_cpu_cores = [cpu_cores[pos - 1] for pos in [3, 4, 8, 9, 10, 18]]
+        jc_singleton_core = [cpu_cores[pos - 1] for pos in [17]]
     elif len(cpu_cores) == 17:
         app_thread_core = [cpu_cores[pos - 1] for pos in [12]]
         jm_cpu_core = [cpu_cores[pos - 1] for pos in [13]]
-        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [4, 5, 6, 11, 14, 15]]
+        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [4, 5, 6, 11, 14]]
         alceml_cpu_cores = [cpu_cores[pos - 1] for pos in [1, 2]]
         alceml_cpu_worker_cores = [cpu_cores[pos - 1] for pos in [10]]
         distrib_cpu_cores = [cpu_cores[pos - 1] for pos in [3, 7, 8, 9, 16, 17]]
+        jc_singleton_core = [cpu_cores[pos - 1] for pos in [15]]
     elif len(cpu_cores) == 15:
         app_thread_core = [cpu_cores[pos - 1] for pos in [11]]
         jm_cpu_core = [cpu_cores[pos - 1] for pos in [12]]
-        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [5, 6, 10, 13, 14]]
+        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [5, 6, 10, 13]]
         alceml_cpu_cores = [cpu_cores[pos - 1] for pos in [1, 2]]
         alceml_cpu_worker_cores = [cpu_cores[pos - 1] for pos in [9]]
         distrib_cpu_cores = [cpu_cores[pos - 1] for pos in [3, 4, 7, 8, 15]]
+        jc_singleton_core = [cpu_cores[pos - 1] for pos in [14]]
     elif len(cpu_cores) == 13:
         app_thread_core = [cpu_cores[pos - 1] for pos in [9]]
         jm_cpu_core = [cpu_cores[pos - 1] for pos in [10]]
-        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [3, 4, 5, 11, 12]]
+        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [3, 4, 5, 11]]
         alceml_cpu_cores = [cpu_cores[pos - 1] for pos in [1]]
         alceml_cpu_worker_cores = [cpu_cores[pos - 1] for pos in [8]]
         distrib_cpu_cores = [cpu_cores[pos - 1] for pos in [2, 6, 7, 13]]
+        jc_singleton_core = [cpu_cores[pos - 1] for pos in [12]]
     elif len(cpu_cores) == 11:
         app_thread_core = [cpu_cores[pos - 1] for pos in [8]]
         jm_cpu_core = [cpu_cores[pos - 1] for pos in [9]]
-        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [3, 4, 10, 11]]
+        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [3, 4, 10]]
         alceml_cpu_cores = [cpu_cores[pos - 1] for pos in [1]]
         alceml_cpu_worker_cores = [cpu_cores[pos - 1] for pos in [7]]
         distrib_cpu_cores = [cpu_cores[pos - 1] for pos in [2, 5, 6]]
+        jc_singleton_core = [cpu_cores[pos - 1] for pos in [11]]
     elif len(cpu_cores) == 9:
         app_thread_core = [cpu_cores[pos - 1] for pos in [7]]
         jm_cpu_core = [cpu_cores[pos - 1] for pos in [8]]
-        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [3, 4, 9]]
+        poller_cpu_cores = [cpu_cores[pos - 1] for pos in [3, 4]]
         alceml_cpu_cores = [cpu_cores[pos - 1] for pos in [1]]
         alceml_cpu_worker_cores = [cpu_cores[pos - 1] for pos in [4, 9]]
         distrib_cpu_cores = [cpu_cores[pos - 1] for pos in [2, 5, 6]]
+        jc_singleton_core = [cpu_cores[pos - 1] for pos in [7]]
     elif len(cpu_cores) == 7:
         app_thread_core = [cpu_cores[pos - 1] for pos in [6]]
         jm_cpu_core = [cpu_cores[pos - 1] for pos in [7]]
@@ -410,6 +418,7 @@ def calculate_core_allocation(cpu_cores):
         alceml_cpu_cores = [cpu_cores[pos - 1] for pos in [1]]
         alceml_cpu_worker_cores = [cpu_cores[pos - 1] for pos in [1]]
         distrib_cpu_cores = [cpu_cores[pos - 1] for pos in [2, 4]]
+        jc_singleton_core = [cpu_cores[pos - 1] for pos in [6]]
     elif len(cpu_cores) == 5:
         app_thread_core = [cpu_cores[pos - 1] for pos in [5]]
         jm_cpu_core = [cpu_cores[pos - 1] for pos in [4]]
@@ -417,6 +426,7 @@ def calculate_core_allocation(cpu_cores):
         alceml_cpu_cores = [cpu_cores[pos - 1] for pos in [1]]
         alceml_cpu_worker_cores = [cpu_cores[pos - 1] for pos in [1]]
         distrib_cpu_cores = [cpu_cores[pos - 1] for pos in [2, 3]]
+        jc_singleton_core = [cpu_cores[pos - 1] for pos in [5]]
     elif len(cpu_cores) == 4:
         app_thread_core = [cpu_cores[pos - 1] for pos in [4]]
         jm_cpu_core = [cpu_cores[pos - 1] for pos in [4]]
@@ -424,10 +434,11 @@ def calculate_core_allocation(cpu_cores):
         alceml_cpu_cores = [cpu_cores[pos - 1] for pos in [1]]
         alceml_cpu_worker_cores = [cpu_cores[pos - 1] for pos in [1]]
         distrib_cpu_cores = [cpu_cores[pos - 1] for pos in [2, 3]]
+        jc_singleton_core = [cpu_cores[pos - 1] for pos in [4]]
     else:
-        app_thread_core = jm_cpu_core = poller_cpu_cores = alceml_cpu_cores = alceml_cpu_worker_cores = distrib_cpu_cores = []
+        app_thread_core = jm_cpu_core = poller_cpu_cores = alceml_cpu_cores = alceml_cpu_worker_cores = distrib_cpu_cores = jc_singleton_core = []
 
-    return app_thread_core, jm_cpu_core, poller_cpu_cores, alceml_cpu_cores, alceml_cpu_worker_cores, distrib_cpu_cores
+    return app_thread_core, jm_cpu_core, poller_cpu_cores, alceml_cpu_cores, alceml_cpu_worker_cores, distrib_cpu_cores, jc_singleton_core
 
 
 def generate_mask(cores):

{sbcli_dev-3.8.85 → sbcli_dev-3.8.86}/simplyblock_web/templates/storage_deploy_spdk.yaml.j2

@@ -89,10 +89,10 @@ spec:
           mountPath: /script
         resources:
           limits:
-            hugepages-2Mi: {{ MEM_GEGA }}Gi
-            memory: 4096Mi
+            hugepages-2Mi: 20Gi
+            memory: 10Gi
           requests:
-            memory: 4096Mi
+            memory: 10Gi
 
       - name: spdk-proxy-container
         image: {{ SIMPLYBLOCK_DOCKER_IMAGE }}