sbcli-pre 1.4.5__zip → 1.4.7__zip

{sbcli_pre-1.4.5 → sbcli_pre-1.4.7}/PKG-INFO

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

{sbcli_pre-1.4.5 → sbcli_pre-1.4.7}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=1.4.5
+SIMPLY_BLOCK_VERSION=1.4.7
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:pre-release

{sbcli_pre-1.4.5 → sbcli_pre-1.4.7}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.4.5 → sbcli_pre-1.4.7}/simplyblock_cli/cli.py

@@ -608,6 +608,12 @@ class CLIWrapper:
         sub_command = self.add_sub_command(subparser, 'recreate', 'recreate Caching node bdevs')
         sub_command.add_argument("node_id", help='Caching node UUID')
 
+        sub_command = self.add_sub_command(subparser, 'get-lvol-stats', 'Get LVol stats')
+        sub_command.add_argument("node_id", help='Caching node UUID')
+        sub_command.add_argument("lvol_id", help='LVol UUID')
+        sub_command.add_argument("--duration", help='collection duration in seconds, default: 5', type=int, default=5)
+
+
     def init_parser(self):
         self.parser = argparse.ArgumentParser(prog=constants.SIMPLY_BLOCK_CLI_NAME, description='SimplyBlock management CLI')
         self.parser.add_argument("-d", '--debug', help='Print debug messages', required=False, action='store_true')
@@ -1104,6 +1110,8 @@ class CLIWrapper:
             if sub_command == "recreate":
                 ret = caching_node_controller.recreate(args.node_id)
 
+            if sub_command == "get-lvol-stats":
+                ret = caching_node_controller.get_lvol_stats(args.node_id, args.lvol_id, args.duration)
 
         else:
             self.parser.print_help()

{sbcli_pre-1.4.5 → sbcli_pre-1.4.7}/simplyblock_core/controllers/caching_node_controller.py

@@ -211,43 +211,57 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list, spdk_cpu_mask, spd
 
     ssd_size = ssd_dev.size
     supported_ssd_size = mem * 100 / 2.25
+    split_factor = math.ceil(ssd_size/supported_ssd_size)
 
     logger.info(f"Supported SSD size: {utils.humanbytes(supported_ssd_size)}")
     logger.info(f"SSD size: {utils.humanbytes(ssd_size)}")
 
+    cache_size = 0
+    cache_bdev = None
     if supported_ssd_size < ssd_size:
-        logger.info(f"SSD size is bigger than the supported size, creating partition")
-
-        nbd_device = rpc_client.nbd_start_disk(ssd_dev.nvme_bdev)
-        time.sleep(3)
-        if not nbd_device:
-            logger.error(f"Failed to start nbd dev")
-            return False
-
-        jm_percent = int((supported_ssd_size/ssd_size) * 100)
-        result, error = cnode_api.make_gpt_partitions(nbd_device, jm_percent)
-        if error:
-            logger.error(f"Failed to make partitions")
-            logger.error(error)
-            return False
-        time.sleep(3)
-        rpc_client.nbd_stop_disk(nbd_device)
-        time.sleep(1)
-        rpc_client.bdev_nvme_detach_controller(ssd_dev.nvme_controller)
-        time.sleep(1)
-        rpc_client.bdev_nvme_controller_attach(ssd_dev.nvme_controller, ssd_dev.pcie_address)
-        time.sleep(1)
-        rpc_client.bdev_examine(ssd_dev.nvme_bdev)
-        time.sleep(1)
-
-        cache_bdev = f"{ssd_dev.nvme_bdev}p1"
-        cache_size = int(supported_ssd_size)
-
+        logger.info(f"SSD size is bigger than the supported size, will use split bdev: {split_factor}")
+        ret = rpc_client.bdev_split(ssd_dev.nvme_bdev, split_factor)
+        cache_bdev = ret[0]
+        cache_size = int(ssd_dev.size/split_factor)
+        snode.cache_split_factor = split_factor
     else:
-
+        snode.cache_split_factor = 0
         cache_bdev = ssd_dev.nvme_bdev
         cache_size = ssd_dev.size
 
+    # if supported_ssd_size < ssd_size:
+    #     logger.info(f"SSD size is bigger than the supported size, creating partition")
+    #
+    #     nbd_device = rpc_client.nbd_start_disk(ssd_dev.nvme_bdev)
+    #     time.sleep(3)
+    #     if not nbd_device:
+    #         logger.error(f"Failed to start nbd dev")
+    #         return False
+    #
+    #     jm_percent = int((supported_ssd_size/ssd_size) * 100)
+    #     result, error = cnode_api.make_gpt_partitions(nbd_device, jm_percent)
+    #     if error:
+    #         logger.error(f"Failed to make partitions")
+    #         logger.error(error)
+    #         return False
+    #     time.sleep(3)
+    #     rpc_client.nbd_stop_disk(nbd_device)
+    #     time.sleep(1)
+    #     rpc_client.bdev_nvme_detach_controller(ssd_dev.nvme_controller)
+    #     time.sleep(1)
+    #     rpc_client.bdev_nvme_controller_attach(ssd_dev.nvme_controller, ssd_dev.pcie_address)
+    #     time.sleep(1)
+    #     rpc_client.bdev_examine(ssd_dev.nvme_bdev)
+    #     time.sleep(1)
+    #
+    #     cache_bdev = f"{ssd_dev.nvme_bdev}p1"
+    #     cache_size = int(supported_ssd_size)
+    #
+    # else:
+    #
+    #     cache_bdev = ssd_dev.nvme_bdev
+    #     cache_size = ssd_dev.size
+
     logger.info(f"Cache size: {utils.humanbytes(cache_size)}")
 
     snode.cache_bdev = cache_bdev
@@ -717,3 +731,43 @@ def remove_node(node_id, force=False):
 
     snode.remove(db_controller.kv_store)
     logger.info("done")
+
+
+def get_lvol_stats(caching_node_id, lvol_id, duration=5):
+    db_controller = DBController()
+    cnode = db_controller.get_caching_node_by_id(caching_node_id)
+    if not cnode:
+        logger.info(f"Caching node uuid not found: {caching_node_id}")
+        cnode = db_controller.get_caching_node_by_hostname(caching_node_id)
+        if not cnode:
+            logger.error("Caching node not found")
+            return False
+
+    lvol = db_controller.get_lvol_by_id(lvol_id)
+    if not lvol:
+        logger.error(f"LVol not found: {lvol_id}")
+        return False
+
+    rpc_client = RPCClient(
+        cnode.mgmt_ip, cnode.rpc_port,
+        cnode.rpc_username, cnode.rpc_password,
+        timeout=3, retry=2)
+
+    ocf_bdev = None
+    for lv in cnode.lvols:
+        if lv.lvol_id == lvol.get_id():
+            ocf_bdev = lv.ocf_bdev
+
+    if not ocf_bdev:
+        logger.error(f"LVol is not connected to caching node")
+        return False
+
+    logger.info("Getting bdev stats: %s", ocf_bdev)
+
+    while True:
+        stats_dict = rpc_client.get_lvol_stats(ocf_bdev)
+        print(datetime.datetime.now())
+        print(json.dumps(stats_dict, indent=2))
+        time.sleep(duration)
+
+    return True

{sbcli_pre-1.4.5 → sbcli_pre-1.4.7}/simplyblock_core/controllers/lvol_controller.py

@@ -9,9 +9,8 @@ import uuid
 from typing import Tuple
 
 from simplyblock_core import utils, constants, distr_controller
-from simplyblock_core.controllers import snapshot_controller, pool_controller, lvol_events
+from simplyblock_core.controllers import snapshot_controller, pool_controller, lvol_events, caching_node_controller
 from simplyblock_core.kv_store import DBController
-from simplyblock_core.models.cluster import Cluster
 from simplyblock_core.models.nvme_device import NVMeDevice
 from simplyblock_core.models.pool import Pool
 from simplyblock_core.models.lvol_model import LVol
@@ -1016,6 +1015,13 @@ def delete_lvol(id_or_name, force_delete=False):
     lvol.status = LVol.STATUS_IN_DELETION
     lvol.write_to_db(db_controller.kv_store)
 
+    # disconnect from caching nodes:
+    cnodes = db_controller.get_caching_nodes()
+    for cnode in cnodes:
+        for lv in cnode.lvols:
+            if lv.lvol_id == lvol.get_id():
+                caching_node_controller.disconnect(cnode.get_id(), lvol.get_id())
+
     if lvol.ha_type == 'single':
         ret = delete_lvol_from_node(lvol.get_id(), lvol.node_id)
         if not ret: