sbcli-dev 3.8.91__zip → 3.8.93__zip

{sbcli_dev-3.8.91 → sbcli_dev-3.8.93}/PKG-INFO

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

{sbcli_dev-3.8.91 → sbcli_dev-3.8.93}/env_var

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

{sbcli_dev-3.8.91 → sbcli_dev-3.8.93}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.91 → sbcli_dev-3.8.93}/simplyblock_core/controllers/tasks_controller.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+import json
 import logging
 import time
 import uuid
@@ -80,14 +81,17 @@ 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)
         return False
 
-    data = []
     tasks = db_controller.get_job_tasks(cluster_id)
+    if tasks and is_json is True:
+        return json.dumps(tasks, indent=2)
+
+    data = []
     for task in tasks:
         data.append({
             "Task ID": task.uuid,

{sbcli_dev-3.8.91 → sbcli_dev-3.8.93}/simplyblock_core/models/storage_node.py

@@ -52,6 +52,7 @@ class StorageNode(BaseModel):
         "create_dt": {"type": str, 'default': str(datetime.now())},
         "remove_dt": {"type": str, 'default': str(datetime.now())},
         "mgmt_ip": {"type": str, 'default': ""},
+        "primary_ip": {"type": str, 'default': ""},
         "rpc_port": {"type": int, 'default': -1},
         "rpc_username": {"type": str, 'default': ""},
         "rpc_password": {"type": str, 'default': ""},

{sbcli_dev-3.8.91 → sbcli_dev-3.8.93}/simplyblock_core/storage_node_ops.py

@@ -1027,6 +1027,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
     snode.subsystem = subsystem_nqn
     snode.data_nics = data_nics
     snode.mgmt_ip = mgmt_ip
+    snode.primary_ip = mgmt_ip
     snode.rpc_port = constants.RPC_HTTP_PROXY_PORT
     snode.rpc_username = rpc_user
     snode.rpc_password = rpc_pass
@@ -1416,6 +1417,7 @@ def restart_storage_node(
                         'status': device['status'],
                         'net_type': device['net_type']}))
             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)
@@ -2794,4 +2796,7 @@ def make_sec_new_primary(node_id):
         if dev.status == NVMeDevice.STATUS_NEW:
             device_controller.add_device(dev.get_id())
 
+    snode = db_controller.get_storage_node_by_id(node_id)
+    snode.primary_ip = snode.mgmt_ip
+    snode.write_to_db(db_controller.kv_store)
     return True

{sbcli_dev-3.8.91 → sbcli_dev-3.8.93}/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.91 → sbcli_dev-3.8.93}/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,21 @@ 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")
+
+    data = []
+    tasks = tasks_controller.list_tasks(uuid, is_json=True)
+    for t in tasks:
+        data.append(t.get_clean_dict())
+    return utils.get_response(data)
+
+
 @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.91 → sbcli_dev-3.8.93}/simplyblock_web/templates/storage_deploy_spdk.yaml.j2

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