sbcli-dev 3.8.92__zip → 3.8.94__zip

{sbcli_dev-3.8.92 → sbcli_dev-3.8.94}/PKG-INFO

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

{sbcli_dev-3.8.92 → sbcli_dev-3.8.94}/env_var

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

{sbcli_dev-3.8.92 → sbcli_dev-3.8.94}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.92 → sbcli_dev-3.8.94}/simplyblock_core/cluster_ops.py

@@ -456,9 +456,14 @@ def cluster_set_read_only(cl_id):
     if ret:
         st = db_controller.get_storage_nodes_by_cluster_id(cl_id)
         for node in st:
-            for dev in node.nvme_devices:
-                if dev.status == NVMeDevice.STATUS_ONLINE:
-                    device_controller.device_set_read_only(dev.get_id())
+            rpc_client = RPCClient(
+                node.mgmt_ip, node.rpc_port,
+                node.rpc_username, node.rpc_password, timeout=5, retry=2)
+
+            for bdev in node.lvstore_stack:
+                if bdev['type'] == "bdev_distr":
+                    rpc_client.bdev_distrib_toggle_cluster_full(bdev['name'], cluster_full=True)
+
     return True
 
 
@@ -476,9 +481,14 @@ def cluster_set_active(cl_id):
     if ret:
         st = db_controller.get_storage_nodes_by_cluster_id(cl_id)
         for node in st:
-            for dev in node.nvme_devices:
-                if dev.status == NVMeDevice.STATUS_READONLY:
-                    device_controller.device_set_online(dev.get_id())
+            rpc_client = RPCClient(
+                node.mgmt_ip, node.rpc_port,
+                node.rpc_username, node.rpc_password, timeout=5, retry=2)
+
+            for bdev in node.lvstore_stack:
+                if bdev['type'] == "bdev_distr":
+                    rpc_client.bdev_distrib_toggle_cluster_full(bdev['name'], cluster_full=False)
+
     return True
 
 

{sbcli_dev-3.8.92 → sbcli_dev-3.8.94}/simplyblock_core/constants.py

@@ -37,12 +37,12 @@ DEVICE_OVERLOAD_CAPACITY_THRESHOLD = 50
 CLUSTER_NQN = "nqn.2023-02.io.simplyblock"
 
 weights = {
-    "lvol": 50,
-    "cpu": 10,
-    "r_io": 10,
-    "w_io": 10,
-    "r_b": 10,
-    "w_b": 10
+    "lvol": 100,
+    # "cpu": 10,
+    # "r_io": 10,
+    # "w_io": 10,
+    # "r_b": 10,
+    # "w_b": 10
 }
 
 

{sbcli_dev-3.8.92 → sbcli_dev-3.8.94}/simplyblock_core/controllers/lvol_controller.py

@@ -186,31 +186,32 @@ def get_ha_jm_names(current_node, snode_list):
 
 def _get_next_3_nodes(cluster_id, lvol_size=0):
     snodes = db_controller.get_storage_nodes_by_cluster_id(cluster_id)
-    online_nodes = []
+    # online_nodes = []
     node_stats = {}
     for node in snodes:
         if node.status == node.STATUS_ONLINE:
             # Validate Eligible nodes for adding lvol
-            snode_api = SNodeClient(node.api_endpoint)
-            result, _ = snode_api.info()
-            memory_free = result["memory_details"]["free"]
-            huge_free = result["memory_details"]["huge_free"]
-            total_node_capacity = db_controller.get_snode_size(node.get_id())
-            error = utils.validate_add_lvol_or_snap_on_node(memory_free, huge_free, node.max_lvol, lvol_size,  total_node_capacity, len(node.lvols))
-            if error:
-                logger.warning(error)
-                continue
-
-            online_nodes.append(node)
-            node_stat_list = db_controller.get_node_stats(node, limit=1000)
-            combined_record = utils.sum_records(node_stat_list)
+            # snode_api = SNodeClient(node.api_endpoint)
+            # result, _ = snode_api.info()
+            # memory_free = result["memory_details"]["free"]
+            # huge_free = result["memory_details"]["huge_free"]
+            # total_node_capacity = db_controller.get_snode_size(node.get_id())
+            # error = utils.validate_add_lvol_or_snap_on_node(memory_free, huge_free, node.max_lvol, lvol_size,  total_node_capacity, len(node.lvols))
+            # if error:
+            #     logger.warning(error)
+            #     continue
+            #
+            # online_nodes.append(node)
+            # node_stat_list = db_controller.get_node_stats(node, limit=1000)
+            # combined_record = utils.sum_records(node_stat_list)
             node_st = {
-                "lvol": len(node.lvols),
-                "cpu": 1 + (node.cpu * node.cpu_hz),
-                "r_io": combined_record.read_io_ps,
-                "w_io": combined_record.write_io_ps,
-                "r_b": combined_record.read_bytes_ps,
-                "w_b": combined_record.write_bytes_ps}
+                "lvol": len(node.lvols) or 1,
+                # "cpu": 1 + (node.cpu * node.cpu_hz),
+                # "r_io": combined_record.read_io_ps,
+                # "w_io": combined_record.write_io_ps,
+                # "r_b": combined_record.read_bytes_ps,
+                # "w_b": combined_record.write_bytes_ps
+            }
 
             node_stats[node.get_id()] = node_st
 
@@ -243,7 +244,7 @@ def _get_next_3_nodes(cluster_id, lvol_size=0):
     #############
 
     selected_node_ids = []
-    while len(selected_node_ids) < min(len(online_nodes), 3):
+    while len(selected_node_ids) < min(len(node_stats), 3):
         r_index = random.randint(0, n_start)
         print(f"Random is {r_index}/{n_start}")
         for node_id in node_start_end:

{sbcli_dev-3.8.92 → sbcli_dev-3.8.94}/simplyblock_core/controllers/tasks_controller.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+import json
 import logging
 import time
 import uuid
@@ -80,7 +81,7 @@ def add_node_to_auto_restart(node):
     return _add_task(JobSchedule.FN_NODE_RESTART, node.cluster_id, node.get_id(), "")
 
 
-def list_tasks(cluster_id):
+def list_tasks(cluster_id, is_json=False):
     cluster = db_controller.get_cluster_by_id(cluster_id)
     if not cluster:
         logger.error("Cluster not found: %s", cluster_id)
@@ -88,6 +89,11 @@ def list_tasks(cluster_id):
 
     data = []
     tasks = db_controller.get_job_tasks(cluster_id)
+    if tasks and is_json is True:
+        for t in tasks:
+            data.append(t.get_clean_dict())
+        return json.dumps(data, indent=2)
+
     for task in tasks:
         data.append({
             "Task ID": task.uuid,

{sbcli_dev-3.8.92 → sbcli_dev-3.8.94}/simplyblock_core/rpc_client.py

@@ -795,3 +795,10 @@ class RPCClient:
     def bdev_lvol_inflate(self, name):
         params = {"name": name}
         return self._request("bdev_lvol_inflate", params)
+
+    def bdev_distrib_toggle_cluster_full(self, name, cluster_full=False):
+        params = {
+            "name": name,
+            "cluster_full": cluster_full,
+        }
+        return self._request("bdev_distrib_toggle_cluster_full", params)

{sbcli_dev-3.8.92 → sbcli_dev-3.8.94}/simplyblock_core/storage_node_ops.py

@@ -1396,6 +1396,10 @@ def restart_storage_node(
         if force is False:
             return False
 
+    logger.info("Setting node state to restarting")
+    set_node_status(node_id, StorageNode.STATUS_RESTARTING)
+    snode = db_controller.get_storage_node_by_id(node_id)
+
     if node_ip:
         if node_ip != snode.api_endpoint:
             logger.info(f"Restarting on new node with ip: {node_ip}")
@@ -1419,9 +1423,6 @@ def restart_storage_node(
             snode.data_nics = data_nics
             snode.hostname = node_info['hostname']
 
-    logger.info("Setting node state to restarting")
-    set_node_status(node_id, StorageNode.STATUS_RESTARTING)
-
     logger.info(f"Restarting Storage node: {snode.mgmt_ip}")
     snode_api = SNodeClient(snode.api_endpoint, timeout=5*60, retry=3)
     node_info, _ = snode_api.info()

{sbcli_dev-3.8.92 → sbcli_dev-3.8.94}/simplyblock_core/utils.py

@@ -347,7 +347,7 @@ def calculate_core_allocation(cpu_cores):
     https://docs.google.com/spreadsheets/d/14vxL9W31-7oFT6tEeLNuaJJO0FwG9cZK/edit?gid=1468847899#gid=1468847899
     '''
 
-    if len(cpu_cores) == 23:
+    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]]
@@ -355,7 +355,7 @@ def calculate_core_allocation(cpu_cores):
         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:
+    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]]
@@ -363,7 +363,7 @@ def calculate_core_allocation(cpu_cores):
         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:
+    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]]
@@ -371,7 +371,7 @@ def calculate_core_allocation(cpu_cores):
         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:
+    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]]
@@ -379,7 +379,7 @@ def calculate_core_allocation(cpu_cores):
         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:
+    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]]
@@ -387,7 +387,7 @@ def calculate_core_allocation(cpu_cores):
         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:
+    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]]
@@ -395,7 +395,7 @@ def calculate_core_allocation(cpu_cores):
         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:
+    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]]
@@ -403,7 +403,7 @@ def calculate_core_allocation(cpu_cores):
         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:
+    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]]
@@ -411,7 +411,7 @@ def calculate_core_allocation(cpu_cores):
         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:
+    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]]
         poller_cpu_cores = [cpu_cores[pos - 1] for pos in [3, 5]]
@@ -419,7 +419,7 @@ def calculate_core_allocation(cpu_cores):
         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:
+    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]]
         poller_cpu_cores = [cpu_cores[pos - 1] for pos in [2, 3]]
@@ -427,7 +427,7 @@ def calculate_core_allocation(cpu_cores):
         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:
+    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]]
         poller_cpu_cores = [cpu_cores[pos - 1] for pos in [2, 3]]

{sbcli_dev-3.8.92 → sbcli_dev-3.8.94}/simplyblock_web/blueprints/web_api_cluster.py

@@ -3,12 +3,11 @@
 import json
 import logging
 import threading
-import time
-import uuid
 
 from flask import Blueprint
 from flask import request
 
+from simplyblock_core.controllers import tasks_controller
 from simplyblock_web import utils
 
 from simplyblock_core import kv_store, cluster_ops
@@ -126,6 +125,18 @@ def cluster_get_logs(uuid):
     return utils.get_response(json.loads(data))
 
 
+@bp.route('/cluster/get-tasks/<string:uuid>', methods=['GET'])
+def cluster_get_tasks(uuid):
+    cluster = db_controller.get_cluster_by_id(uuid)
+    if not cluster:
+        return utils.get_response_error(f"Cluster not found: {uuid}", 404)
+    if cluster.status == Cluster.STATUS_INACTIVE:
+        return utils.get_response("Cluster is inactive")
+
+    tasks = tasks_controller.list_tasks(uuid, is_json=True)
+    return utils.get_response(json.loads(tasks))
+
+
 @bp.route('/cluster/gracefulshutdown/<string:uuid>', methods=['PUT'])
 def cluster_grace_shutdown(uuid):
     cluster = db_controller.get_cluster_by_id(uuid)

{sbcli_dev-3.8.92 → sbcli_dev-3.8.94}/simplyblock_web/templates/storage_deploy_spdk.yaml.j2

@@ -89,7 +89,7 @@ spec:
           mountPath: /script
         resources:
           limits:
-            hugepages-2Mi: 20Gi
+            hugepages-2Mi: {{ MEM_GEGA }}Gi
             memory: 10Gi
           requests:
             memory: 10Gi