sbcli-dev 3.8.93__zip → 3.8.95__zip

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

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

{sbcli_dev-3.8.93 → sbcli_dev-3.8.95}/env_var

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

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

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

{sbcli_dev-3.8.93 → sbcli_dev-3.8.95}/simplyblock_cli/cli.py

@@ -39,13 +39,13 @@ class CLIWrapper:
         sub_command.add_argument("cluster_id", help='UUID of the cluster to which the node will belong')
         sub_command.add_argument("node_ip", help='IP of storage node to add')
         sub_command.add_argument("ifname", help='Management interface name')
-        sub_command.add_argument("--partitions", help='Number of partitions to create per device', type=int, default=0)
+        sub_command.add_argument("--partitions", help='Number of partitions to create per device', type=int, default=1)
         sub_command.add_argument("--jm-percent", help='Number in percent to use for JM from each device',
                                  type=int, default=3, dest='jm_percent')
         sub_command.add_argument("--data-nics", help='Data interface names', nargs='+', dest='data_nics')
         sub_command.add_argument("--max-lvol", help='Max lvol per storage node', dest='max_lvol', type=int)
-        sub_command.add_argument("--max-snap", help='Max snapshot per storage node', dest='max_snap', type=int)
-        sub_command.add_argument("--max-prov", help='Max provisioning size of all storage nodes', dest='max_prov')
+        sub_command.add_argument("--max-snap", help='Max snapshot per storage node', dest='max_snap', type=int, default=500)
+        sub_command.add_argument("--max-prov", help='Maximum amount of GB to be provisioned via all storage nodes', dest='max_prov')
         sub_command.add_argument("--number-of-distribs", help='The number of distirbs to be created on the node', dest='number_of_distribs', type=int, default=4)
         sub_command.add_argument("--number-of-devices", help='Number of devices per storage node if it\'s not supported EC2 instance', dest='number_of_devices', type=int)
         sub_command.add_argument("--cpu-mask", help='SPDK app CPU mask, default is all cores found', dest='spdk_cpu_mask')
@@ -56,7 +56,7 @@ class CLIWrapper:
         sub_command.add_argument("--iobuf_small_bufsize", help='bdev_set_options param', dest='small_bufsize',  type=int, default=0)
         sub_command.add_argument("--iobuf_large_bufsize", help='bdev_set_options param', dest='large_bufsize',  type=int, default=0)
         sub_command.add_argument("--enable-test-device", help='Enable creation of test device', action='store_true')
-        sub_command.add_argument("--enable-ha-jm", help='Enable HA JM for ditrib creation', action='store_true')
+        sub_command.add_argument("--disable-ha-jm", help='Disable HA JM for distrib creation', action='store_false', dest='enable_ha_jm', default=True)
 
 
         # delete storage node
@@ -706,8 +706,6 @@ class CLIWrapper:
             elif sub_command == "add-node":
                 if not args.max_lvol:
                     self.parser.error(f"Mandatory argument '--max-lvol' not provided for {sub_command}")
-                if not args.max_snap:
-                    self.parser.error(f"Mandatory argument '--max-snap' not provided for {sub_command}")
                 if not args.max_prov:
                     self.parser.error(f"Mandatory argument '--max-prov' not provided for {sub_command}")
                 # if not args.spdk_cpu_mask:
@@ -732,13 +730,11 @@ class CLIWrapper:
 
                 max_lvol = args.max_lvol
                 max_snap = args.max_snap
-                max_prov = self.parse_size(args.max_prov)
+                max_prov = args.max_prov
                 number_of_devices = args.number_of_devices
                 enable_test_device = args.enable_test_device
                 enable_ha_jm = args.enable_ha_jm
                 number_of_distribs = args.number_of_distribs
-                if max_prov < 1 * 1024 * 1024 * 1024:
-                    return f"Max provisioning memory:{args.max_prov} must be larger than 1G"
 
                 out = storage_ops.add_node(
                     cluster_id=cluster_id,
@@ -781,7 +777,7 @@ class CLIWrapper:
 
                 max_lvol = args.max_lvol
                 max_snap = args.max_snap
-                max_prov = self.parse_size(args.max_prov) if args.max_prov else 0
+                max_prov = args.max_prov if args.max_prov else 0
                 number_of_devices = args.number_of_devices
 
                 small_bufsize = args.small_bufsize

{sbcli_dev-3.8.93 → sbcli_dev-3.8.95}/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.93 → sbcli_dev-3.8.95}/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.93 → sbcli_dev-3.8.95}/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.93 → sbcli_dev-3.8.95}/simplyblock_core/controllers/tasks_controller.py

@@ -87,11 +87,13 @@ def list_tasks(cluster_id, is_json=False):
         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)
+        for t in tasks:
+            data.append(t.get_clean_dict())
+        return json.dumps(data, indent=2)
 
-    data = []
     for task in tasks:
         data.append({
             "Task ID": task.uuid,

{sbcli_dev-3.8.93 → sbcli_dev-3.8.95}/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.93 → sbcli_dev-3.8.95}/simplyblock_core/storage_node_ops.py

@@ -923,7 +923,11 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
         if not number_of_devices:
             logger.error("Unsupported instance type please specify --number-of-devices.")
             return False
-
+    try:
+        max_prov = int(max_prov)
+        max_prov = f"{max_prov}g"
+    except Exception:
+        pass
     max_prov = int(utils.parse_size(max_prov))
     number_of_split = num_partitions_per_dev if num_partitions_per_dev else 1
     number_of_alceml_devices = number_of_devices * number_of_split
@@ -1396,6 +1400,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 +1427,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()
@@ -1434,6 +1439,11 @@ def restart_storage_node(
     if max_snap:
         snode.max_snap = max_snap
     if max_prov:
+        try:
+            max_prov = int(max_prov)
+            max_prov = f"{max_prov}g"
+        except Exception:
+            pass
         snode.max_prov = max_prov
     if spdk_image:
         snode.spdk_image = spdk_image

{sbcli_dev-3.8.93 → sbcli_dev-3.8.95}/simplyblock_web/blueprints/web_api_cluster.py

@@ -133,11 +133,8 @@ def cluster_get_tasks(uuid):
     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)
+    return utils.get_response(json.loads(tasks))
 
 
 @bp.route('/cluster/gracefulshutdown/<string:uuid>', methods=['PUT'])

{sbcli_dev-3.8.93 → sbcli_dev-3.8.95}/simplyblock_web/blueprints/web_api_storage_node.py

@@ -186,9 +186,6 @@ def storage_node_add():
     if 'max_lvol' not in req_data:
         return utils.get_response_error("missing required param: max_lvol", 400)
 
-    if 'max_snap' not in req_data:
-        return utils.get_response_error("missing required param: max_snap", 400)
-
     if 'max_prov' not in req_data:
         return utils.get_response_error("missing required param: max_prov", 400)
 
@@ -196,9 +193,10 @@ def storage_node_add():
     node_ip = req_data['node_ip']
     ifname = req_data['ifname']
     max_lvol = int(req_data['max_lvol'])
-    max_snap = int(req_data['max_snap'])
+    max_snap = int(req_data['max_snap'], 500)
     max_prov = req_data['max_prov']
     number_of_distribs = req_data.get('number_of_distribs', 4)
+    disable_ha_jm = req_data.get('disable_ha_jm', False)
 
     spdk_image = None
     if 'spdk_image' in req_data:
@@ -217,11 +215,11 @@ def storage_node_add():
     if 'namespace' in req_data:
         namespace = req_data['namespace']
 
-    jm_percent = 0
+    jm_percent = 3
     if 'jm_percent' in req_data:
         jm_percent = int(req_data['jm_percent'])
 
-    partitions = 0
+    partitions = 1
     if 'partitions' in req_data:
         partitions = int(req_data['partitions'])
 
@@ -263,7 +261,8 @@ def storage_node_add():
         "number_of_devices": number_of_devices,
         "enable_test_device": False,
         "number_of_distribs": number_of_distribs,
-        "namespace": namespace})
+        "namespace": namespace,
+        "disable_ha_jm": disable_ha_jm})
 
     return utils.get_response(True)
 

{sbcli_dev-3.8.93 → sbcli_dev-3.8.95}/simplyblock_web/templates/storage_deploy_spdk.yaml.j2

@@ -90,9 +90,9 @@ spec:
         resources:
           limits:
             hugepages-2Mi: {{ MEM_GEGA }}Gi
-            memory: 4096Mi
+            memory: 10Gi
           requests:
-            memory: 4096Mi
+            memory: 10Gi
 
       - name: spdk-proxy-container
         image: {{ SIMPLYBLOCK_DOCKER_IMAGE }}