sbcli-dev 10.6.4__tar.gz → 10.6.6__tar.gz

{sbcli_dev-10.6.4 → sbcli_dev-10.6.6}/PKG-INFO

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

{sbcli_dev-10.6.4 → sbcli_dev-10.6.6}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.6.4 → sbcli_dev-10.6.6}/simplyblock_cli/cli.py

@@ -47,6 +47,7 @@ class CLIWrapper:
         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=2)
         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("--size-of-device", help='Size of device per storage node', dest='partition_size', type=int)
         sub_command.add_argument("--cpu-mask", help='SPDK app CPU mask, default is all cores found', dest='spdk_cpu_mask')
 
         sub_command.add_argument("--spdk-image", help='SPDK image uri', dest='spdk_image')
@@ -799,6 +800,7 @@ class CLIWrapper:
                     enable_ha_jm=enable_ha_jm,
                     is_secondary_node=args.is_secondary_node,
                     id_device_by_nqn=args.id_device_by_nqn,
+                    partition_size=args.partition_size,
                 )
 
                 return out

{sbcli_dev-10.6.4 → sbcli_dev-10.6.6}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=10.6.4
+SIMPLY_BLOCK_VERSION=10.6.6
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main
 DOCKER_USER=hamdysimplyblock

{sbcli_dev-10.6.4 → sbcli_dev-10.6.6}/simplyblock_core/models/storage_node.py

@@ -80,5 +80,6 @@ class StorageNode(BaseNodeObject):
     spdk_debug: bool = False
     spdk_image: str = ""
     spdk_mem: int = 0
+    partition_size: int = 0
     subsystem: str = ""
     system_uuid: str = ""

{sbcli_dev-10.6.4 → sbcli_dev-10.6.6}/simplyblock_core/scripts/deploy_stack.sh

@@ -35,7 +35,7 @@ docker network create monitoring-net -d overlay --attachable
 docker stack deploy --compose-file="$DIR"/docker-compose-swarm-monitoring.yml monitoring
 
 # wait for the services to become online
-bash "$DIR"/stack_deploy_wait.sh monitoring
+#bash "$DIR"/stack_deploy_wait.sh monitoring
 
 docker stack deploy --compose-file="$DIR"/docker-compose-swarm.yml app
 

{sbcli_dev-10.6.4 → sbcli_dev-10.6.6}/simplyblock_core/snode_client.py

@@ -112,11 +112,12 @@ class SNodeClient:
     def leave_swarm(self):
         return self._request("GET", "leave_swarm")
 
-    def make_gpt_partitions(self, nbd_device, jm_percent, num_partitions):
+    def make_gpt_partitions(self, nbd_device, jm_percent, num_partitions, partition_percent):
         params = {
             "nbd_device": nbd_device,
             "jm_percent": int(jm_percent),
             "num_partitions": int(num_partitions),
+            "partition_percent": int(partition_percent),
         }
         return self._request("POST", "make_gpt_partitions", params)
 

{sbcli_dev-10.6.4 → sbcli_dev-10.6.6}/simplyblock_core/storage_node_ops.py

@@ -521,14 +521,18 @@ def _create_storage_device_stack(rpc_client, nvme, snode, after_restart):
     return nvme
 
 
-def _create_device_partitions(rpc_client, nvme, snode, num_partitions_per_dev, jm_percent):
+def _create_device_partitions(rpc_client, nvme, snode, num_partitions_per_dev, jm_percent, partition_size=0):
     nbd_device = rpc_client.nbd_start_disk(nvme.nvme_bdev)
     time.sleep(3)
     if not nbd_device:
         logger.error(f"Failed to start nbd dev")
         return False
     snode_api = SNodeClient(snode.api_endpoint)
-    result, error = snode_api.make_gpt_partitions(nbd_device, jm_percent, num_partitions_per_dev)
+    partition_percent = 0
+    if partition_size:
+        partition_percent = int(partition_size*100/nvme.size)
+
+    result, error = snode_api.make_gpt_partitions(nbd_device, jm_percent, num_partitions_per_dev, partition_percent)
     if error:
         logger.error(f"Failed to make partitions")
         logger.error(error)
@@ -585,7 +589,7 @@ def _prepare_cluster_devices_partitions(snode, devices):
                 logger.info("Partitioned devices found")
             else:
                 logger.info(f"Creating partitions for {nvme.nvme_bdev}")
-                _create_device_partitions(rpc_client, nvme, snode, snode.num_partitions_per_dev, snode.jm_percent)
+                _create_device_partitions(rpc_client, nvme, snode, snode.num_partitions_per_dev, snode.jm_percent, snode.partition_size)
                 partitioned_devices = _search_for_partitions(rpc_client, nvme)
                 if len(partitioned_devices) == (1 + snode.num_partitions_per_dev):
                     logger.info("Device partitions created")
@@ -865,14 +869,14 @@ def _connect_to_remote_jm_devs(this_node, jm_ids=[]):
                     remote_devices.append(jm_dev)
         elif len(this_node.remote_jm_devices) > 0:
             remote_devices = this_node.remote_jm_devices
-        else:
-            for node in db_controller.get_storage_nodes_by_cluster_id(this_node.cluster_id):
-                if node.get_id() == this_node.get_id() or node.is_secondary_node:
-                    continue
-                if node.jm_device and node.jm_device.status == JMDevice.STATUS_ONLINE:
-                    remote_devices.append(node.jm_device)
-                    if len(remote_devices) >= 3 :
-                        break
+
+        for node in db_controller.get_storage_nodes_by_cluster_id(this_node.cluster_id):
+            if node.get_id() == this_node.get_id() or node.is_secondary_node:
+                continue
+            if node.jm_device and node.jm_device.status == JMDevice.STATUS_ONLINE:
+                remote_devices.append(node.jm_device)
+                if len(remote_devices) >= 3 :
+                    break
 
     new_devs = []
     for jm_dev in remote_devices:
@@ -931,7 +935,8 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
              max_lvol, max_snap, max_prov, spdk_image=None, spdk_debug=False,
              small_bufsize=0, large_bufsize=0, spdk_cpu_mask=None,
              num_partitions_per_dev=0, jm_percent=0, number_of_devices=0, enable_test_device=False,
-             namespace=None, number_of_distribs=2, enable_ha_jm=False, is_secondary_node=False, id_device_by_nqn=False):
+             namespace=None, number_of_distribs=2, enable_ha_jm=False, is_secondary_node=False, id_device_by_nqn=False,
+             partition_size=0):
 
     db_controller = DBController()
     kv_store = db_controller.kv_store
@@ -1211,8 +1216,9 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
     snode.num_partitions_per_dev = num_partitions_per_dev
     snode.jm_percent = jm_percent
     snode.id_device_by_nqn = id_device_by_nqn
+    snode.partition_size = partition_size
 
-    time.sleep(10)
+    time.sleep(5)
 
     # creating RPCClient instance
     rpc_client = RPCClient(
@@ -2025,8 +2031,8 @@ def list_storage_devices(node_id, sort, is_json):
             "UUID": device.uuid,
             "Name": device.device_name,
             "Size": utils.humanbytes(device.size),
-            "Serial Number": device.serial_number,
             "Node ID": device.node_id,
+            "Status": device.status,
         })
 
     for device in snode.remote_jm_devices:
@@ -2036,8 +2042,8 @@ def list_storage_devices(node_id, sort, is_json):
             "UUID": device.uuid,
             "Name": device.remote_bdev,
             "Size": utils.humanbytes(device.size),
-            "Serial Number": "",
-            "Node ID": "",
+            "Node ID": device.node_id,
+            "Status": device.status,
         })
 
     if sort and sort in ['node-seq', 'dev-seq', 'serial']:
@@ -3023,8 +3029,7 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
 
 
 def _create_bdev_stack(snode, lvstore_stack=None, primary_node=None):
-    rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password,
-                           retry=1, timeout=30)
+    rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password )
 
     created_bdevs = []
     if not lvstore_stack:

{sbcli_dev-10.6.4 → sbcli_dev-10.6.6}/simplyblock_web/blueprints/snode_ops.py

@@ -257,8 +257,8 @@ def get_file_content(file_name):
 
 
 def set_cluster_id(cluster_id):
-    out, _, _ = node_utils.run_command(f"echo {cluster_id} > {cluster_id_file}")
-    return out
+    ret = os.popen(f"echo {cluster_id} > {cluster_id_file}").read().strip()
+    return ret
 
 
 def delete_cluster_id():
@@ -326,13 +326,13 @@ def join_swarm():
         node_docker.swarm.leave(force=True)
         time.sleep(2)
     node_docker.swarm.join([f"{cluster_ip}:2377"], join_token)
-    retries = 10
-    while retries > 0:
-        if node_docker.info()["Swarm"]["LocalNodeState"] == "active":
-            break
-        logger.info("Waiting for node to be active...")
-        retries -= 1
-        time.sleep(1)
+    # retries = 10
+    # while retries > 0:
+    #     if node_docker.info()["Swarm"]["LocalNodeState"] == "active":
+    #         break
+    #     logger.info("Waiting for node to be active...")
+    #     retries -= 1
+    #     time.sleep(1)
     logger.info("Joining docker swarm > Done")
 
     try:
@@ -363,11 +363,12 @@ def make_gpt_partitions_for_nbd():
     nbd_device = '/dev/nbd0'
     jm_percent = '3'
     num_partitions = 1
-
+    partition_percent = 0
     try:
         data = request.get_json()
         nbd_device = data['nbd_device']
         jm_percent = data['jm_percent']
+        partition_percent = data['partition_percent']
         num_partitions = data['num_partitions']
     except:
         pass
@@ -379,7 +380,11 @@ def make_gpt_partitions_for_nbd():
     sg_cmd_list = [
         f"sgdisk -t 1:6527994e-2c5a-4eec-9613-8f5944074e8b {nbd_device}",
     ]
-    perc_per_partition = int((100 - jm_percent) / num_partitions)
+    if partition_percent:
+        perc_per_partition = int(partition_percent)
+    else:
+        perc_per_partition = int((100 - jm_percent) / num_partitions)
+
     for i in range(num_partitions):
         st = jm_percent + (i * perc_per_partition)
         en = st + perc_per_partition