sbcli-pre 25.6.6__tar.gz → 25.6.7__tar.gz

{sbcli-pre-25.6.6 → sbcli-pre-25.6.7}/PKG-INFO

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

{sbcli-pre-25.6.6 → sbcli-pre-25.6.7}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli-pre-25.6.6 → sbcli-pre-25.6.7}/simplyblock_core/distr_controller.py

@@ -25,12 +25,24 @@ def send_node_status_event(node, node_status, target_node=None):
         "status": node_status}
     events = {"events": [node_status_event]}
     logger.debug(node_status_event)
+    skipped_nodes = []
     if target_node:
         snodes = [target_node]
     else:
         snodes = db_controller.get_storage_nodes_by_cluster_id(node.cluster_id)
+        for node in snodes:
+            if node.status == StorageNode.STATUS_SCHEDULABLE:
+                skipped_nodes.append(node)
+
     for node in snodes:
-        if node.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_SUSPENDED]:
+        if node.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_SUSPENDED,  StorageNode.STATUS_DOWN]:
+            continue
+        node_found_same_host = False
+        for n in skipped_nodes:
+            if node.mgmt_ip == n.mgmt_ip:
+                node_found_same_host = True
+                break
+        if node_found_same_host:
             continue
         logger.info(f"Sending to: {node.get_id()}")
         rpc_client = RPCClient(node.mgmt_ip, node.rpc_port, node.rpc_username, node.rpc_password, timeout=3, retry=1)
@@ -44,14 +56,26 @@ def send_dev_status_event(device, status, target_node=None):
         return
     db_controller = DBController()
     storage_ID = device.cluster_device_order
+    skipped_nodes = []
+
     if target_node:
         snodes = [db_controller.get_storage_node_by_id(target_node.get_id())]
     else:
         snodes = db_controller.get_storage_nodes_by_cluster_id(device.cluster_id)
+        for node in snodes:
+            if node.status == StorageNode.STATUS_SCHEDULABLE:
+                skipped_nodes.append(node)
+
     for node in snodes:
         if node.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_SUSPENDED, StorageNode.STATUS_DOWN]:
             continue
-
+        node_found_same_host = False
+        for n in skipped_nodes:
+            if node.mgmt_ip == n.mgmt_ip:
+                node_found_same_host = True
+                break
+        if node_found_same_host:
+            continue
         dev_status = status
 
         if status == NVMeDevice.STATUS_ONLINE and node.get_id() != device.node_id:

{sbcli-pre-25.6.6 → sbcli-pre-25.6.7}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=25.6.6
+SIMPLY_BLOCK_VERSION=25.6.7
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:R25.6-PRE

{sbcli-pre-25.6.6 → sbcli-pre-25.6.7}/simplyblock_core/services/storage_node_monitor.py

@@ -248,6 +248,10 @@ while True:
 
         nodes = db.get_storage_nodes_by_cluster_id(cluster_id)
         for snode in nodes:
+
+            # get fresh node object, something could have changed until the last for loop is reached
+            snode = db.get_storage_node_by_id(snode.get_id())
+
             if snode.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_UNREACHABLE,
                                     StorageNode.STATUS_SCHEDULABLE, StorageNode.STATUS_DOWN]:
                 logger.info(f"Node status is: {snode.status}, skipping")

{sbcli-pre-25.6.6 → sbcli-pre-25.6.7}/simplyblock_core/storage_node_ops.py

@@ -3080,6 +3080,10 @@ def add_lvol_thread(lvol, snode, lvol_ana_state="optimized"):
     lvol_obj.io_error = False
     lvol_obj.health_check = True
     lvol_obj.write_to_db()
+    # set QOS
+    if lvol.rw_ios_per_sec or lvol.rw_mbytes_per_sec or lvol.r_mbytes_per_sec or lvol.w_mbytes_per_sec :
+        lvol_controller.set_lvol(lvol.uuid, lvol.rw_ios_per_sec, lvol.rw_mbytes_per_sec,
+                 lvol.r_mbytes_per_sec , lvol.w_mbytes_per_sec)
     return True, None
 
 

{sbcli-pre-25.6.6 → sbcli-pre-25.6.7}/simplyblock_core/utils.py

@@ -518,7 +518,7 @@ def calculate_minimum_hp_memory(small_pool_count, large_pool_count, lvol_count,
     return: minimum_hp_memory in bytes
     '''
     pool_consumption = (small_pool_count * 8 + large_pool_count * 128) / 1024 + 1092
-    memory_consumption = (4 * cpu_count + 1.0277 * pool_consumption + 12 * lvol_count) * (1024 * 1024) + (
+    memory_consumption = (4 * cpu_count + 1.0277 * pool_consumption + 20 * lvol_count) * (1024 * 1024) + (
             250 * 1024 * 1024) * 1.1 * convert_size(max_prov, 'TiB') + constants.EXTRA_HUGE_PAGE_MEMORY
     return int(1.2*memory_consumption)
 
@@ -1753,15 +1753,16 @@ def get_k8s_core_client():
     return client.CoreV1Api()
 
 
-def remove_container(client: docker.DockerClient, name, timeout=3):
+def remove_container(client: docker.DockerClient, name, graceful_timeout=3):
     try:
         container = client.containers.get(name)
-        container.stop(timeout=timeout)
-        container.remove()
+        if graceful_timeout:
+            container.stop(timeout=graceful_timeout)
+        container.remove(force=(not graceful_timeout))
     except docker.errors.NotFound:
         pass
     except docker.errors.APIError as e:
-        if 'Conflict ("removal of container {container.id} is already in progress")' != e.response.reason:
+        if e.response and 'Conflict ("removal of container {container.id} is already in progress")' != e.response.reason:
             raise
 
 def render_and_deploy_alerting_configs(contact_point, grafana_endpoint, cluster_uuid, cluster_secret):

{sbcli-pre-25.6.6 → sbcli-pre-25.6.7}/simplyblock_web/blueprints/caching_node_ops.py

@@ -76,7 +76,7 @@ def spdk_process_start():
 
     node_docker = get_docker_client()
     for name in {f"/spdk_{rpc_port}", f"/spdk_proxy_{rpc_port}"}:
-        core_utils.remove_container(node_docker, name)
+        core_utils.remove_container(node_docker, name, graceful_timeout=0)
 
     spdk_image = constants.SIMPLY_BLOCK_SPDK_CORE_IMAGE
 

{sbcli-pre-25.6.6 → sbcli-pre-25.6.7}/simplyblock_web/blueprints/snode_ops.py

@@ -157,7 +157,7 @@ def spdk_process_start(body: SPDKParams):
 
     node_docker = get_docker_client(timeout=60 * 3)
     for name in {f"/spdk_{body.rpc_port}", f"/spdk_proxy_{body.rpc_port}"}:
-        core_utils.remove_container(node_docker, name)
+        core_utils.remove_container(node_docker, name, graceful_timeout=0)
 
     if body.cluster_ip is not None:
         log_config = LogConfig(type=LogConfig.types.GELF, config={"gelf-address": f"tcp://{body.cluster_ip}:12202"})
@@ -232,7 +232,7 @@ def spdk_process_start(body: SPDKParams):
 })
 def spdk_process_kill(query: _RPCPortQuery):
     for name in {f"/spdk_{query.rpc_port}", f"/spdk_proxy_{query.rpc_port}"}:
-        core_utils.remove_container(get_docker_client(), name)
+        core_utils.remove_container(get_docker_client(), name, graceful_timeout=0)
     return utils.get_response(True)