sbcli-pre 1.4.6__zip → 1.4.7__zip

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

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

{sbcli_pre-1.4.6 → sbcli_pre-1.4.7}/env_var

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

{sbcli_pre-1.4.6 → 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.6
+Version: 1.4.7
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_pre-1.4.6 → 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.6 → sbcli_pre-1.4.7}/simplyblock_core/controllers/caching_node_controller.py

@@ -731,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.6 → 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: