sbcli-dev 3.8.76__zip → 3.8.78__zip

{sbcli_dev-3.8.76 → sbcli_dev-3.8.78}/PKG-INFO

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

{sbcli_dev-3.8.76 → sbcli_dev-3.8.78}/env_var

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

{sbcli_dev-3.8.76 → sbcli_dev-3.8.78}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.76 → sbcli_dev-3.8.78}/simplyblock_core/constants.py

@@ -64,10 +64,10 @@ GELF_PORT = 12201
 
 MIN_HUGE_PAGE_MEMORY_FOR_LVOL = 209715200
 MIN_SYS_MEMORY_FOR_LVOL = 524288000
-#EXTRA_SMALL_POOL_COUNT = 1024
-#EXTRA_LARGE_POOL_COUNT = 128
-EXTRA_SMALL_POOL_COUNT = 0
-EXTRA_LARGE_POOL_COUNT = 0
+EXTRA_SMALL_POOL_COUNT = 1024
+EXTRA_LARGE_POOL_COUNT = 128
+# EXTRA_SMALL_POOL_COUNT = 0
+# EXTRA_LARGE_POOL_COUNT = 0
 EXTRA_HUGE_PAGE_MEMORY = 2147483648
 #EXTRA_SYS_MEMORY = 2147483648
 EXTRA_SYS_MEMORY = 0

{sbcli_dev-3.8.76 → sbcli_dev-3.8.78}/simplyblock_core/controllers/tasks_controller.py

@@ -25,6 +25,15 @@ def _validate_new_task_dev_restart(cluster_id, node_id, device_id):
     return True
 
 
+def _validate_new_task_node_restart(cluster_id, node_id):
+    tasks = db_controller.get_job_tasks(cluster_id)
+    for task in tasks:
+        if task.function_name == JobSchedule.FN_NODE_RESTART and task.node_id == node_id and task.canceled is False:
+            if task.status != JobSchedule.STATUS_DONE:
+                return task.get_id()
+    return False
+
+
 def _add_task(function_name, cluster_id, node_id, device_id,
               max_retry=constants.TASK_EXEC_RETRY_COUNT, function_params=None):
 
@@ -32,7 +41,7 @@ def _add_task(function_name, cluster_id, node_id, device_id,
         if not _validate_new_task_dev_restart(cluster_id, node_id, device_id):
             return False
     elif function_name == JobSchedule.FN_NODE_RESTART:
-        task_id = get_active_node_restart_task(cluster_id, node_id)
+        task_id = _validate_new_task_node_restart(cluster_id, node_id)
         if task_id:
             logger.info(f"Task found, skip adding new task: {task_id}")
             return False

{sbcli_dev-3.8.76 → sbcli_dev-3.8.78}/simplyblock_core/storage_node_ops.py

@@ -328,7 +328,7 @@ def _create_jm_stack_on_raid(rpc_client, jm_nvme_bdevs, snode, after_restart):
     ret = rpc_client.get_bdevs(raid_bdev)
 
     return JMDevice({
-        'uuid': alceml_id,
+        'uuid': snode.get_id(),
         'device_name': jm_bdev,
         'size': ret[0]["block_size"] * ret[0]["num_blocks"],
         'status': JMDevice.STATUS_ONLINE,
@@ -918,8 +918,10 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
             return False
 
     max_prov = int(utils.parse_size(max_prov))
-    number_of_split = num_partitions_per_dev if num_partitions_per_dev else num_partitions_per_dev + 1
+    number_of_split = num_partitions_per_dev if num_partitions_per_dev else 1
     number_of_alceml_devices = number_of_devices * number_of_split
+    # for jm
+    number_of_alceml_devices += 1
     small_pool_count, large_pool_count = utils.calculate_pool_count(
         number_of_alceml_devices, number_of_distribs, cpu_count, len(poller_cpu_cores) or cpu_count)
 
@@ -936,7 +938,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
         logger.info("Node Memory info")
         logger.info(f"Total: {utils.humanbytes(memory_details['total'])}")
         logger.info(f"Free: {utils.humanbytes(memory_details['free'])}")
-        logger.info(f"Minimum required huge pages memory is : {minimum_hp_memory}")
+        logger.info(f"Minimum required huge pages memory is : {utils.humanbytes(minimum_hp_memory)}")
     else:
         logger.error(f"Cannot get memory info from the instance.. Exiting")
         return False
@@ -1389,12 +1391,6 @@ def restart_storage_node(
         if force is False:
             return False
 
-    task_id = tasks_controller.get_active_node_restart_task(snode.cluster_id, snode.get_id())
-    if task_id:
-        logger.error(f"Restart task found: {task_id}, can not restart storage node")
-        if force is False:
-            return False
-
     if node_ip:
         if node_ip != snode.api_endpoint:
             logger.info(f"Restarting on new node with ip: {node_ip}")
@@ -1483,7 +1479,7 @@ def restart_storage_node(
         logger.info("Node Memory info")
         logger.info(f"Total: {utils.humanbytes(memory_details['total'])}")
         logger.info(f"Free: {utils.humanbytes(memory_details['free'])}")
-        logger.info(f"Minimum required huge pages memory is : {minimum_hp_memory}")
+        logger.info(f"Minimum required huge pages memory is : {utils.humanbytes(minimum_hp_memory)}")
     else:
         logger.error(f"Cannot get memory info from the instance.. Exiting")
         return False

{sbcli_dev-3.8.76 → sbcli_dev-3.8.78}/simplyblock_core/utils.py

@@ -478,14 +478,14 @@ def calculate_minimum_hp_memory(small_pool_count, large_pool_count, lvol_count,
     pool_consumption = (small_pool_count * 8 + large_pool_count * 128) / 1024 + 1092
     max_prov_tb = max_prov / (1024 * 1024 * 1024 * 1024)
     memory_consumption = (4 * cpu_count + 1.0277 * pool_consumption + 7 * lvol_count) * (1024 * 1024) + (250 * 1024 * 1024) * 1.1 * max_prov_tb + constants.EXTRA_HUGE_PAGE_MEMORY
-    return memory_consumption
+    return int(memory_consumption)
 
 
 def calculate_minimum_sys_memory(max_prov):
     max_prov_tb = max_prov / (1024 * 1024 * 1024 * 1024)
     minimum_sys_memory = (250 * 1024 * 1024) * 1.1 * max_prov_tb + constants.EXTRA_SYS_MEMORY
     logger.debug(f"Minimum system memory is {humanbytes(minimum_sys_memory)}")
-    return minimum_sys_memory
+    return int(minimum_sys_memory)
 
 
 def calculate_spdk_memory(minimum_hp_memory, minimum_sys_memory, free_sys_memory, huge_total_memory):
@@ -495,8 +495,7 @@ def calculate_spdk_memory(minimum_hp_memory, minimum_sys_memory, free_sys_memory
                        f"Minimum huge pages memory: {humanbytes(minimum_hp_memory)}, "
                        f"Minimum system memory: {humanbytes(minimum_sys_memory)}")
         return False, 0
-    spdk_mem = minimum_hp_memory + (total_free_memory - minimum_hp_memory - minimum_sys_memory) * 0.2
-    spdk_mem = minimum_hp_memory
+    spdk_mem = int(minimum_hp_memory + (total_free_memory - minimum_hp_memory - minimum_sys_memory) * 0.2)
     logger.debug(f"SPDK memory is {humanbytes(spdk_mem)}")
     return True, spdk_mem