sbcli-dev 4.0.53__zip → 4.0.55__zip

{sbcli_dev-4.0.53 → sbcli_dev-4.0.55}/PKG-INFO

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

{sbcli_dev-4.0.53 → sbcli_dev-4.0.55}/env_var

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

{sbcli_dev-4.0.53 → sbcli_dev-4.0.55}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.53 → sbcli_dev-4.0.55}/simplyblock_cli/cli.py

@@ -248,6 +248,9 @@ class CLIWrapper:
                                            'In case of HA SNode, make the current node as primary')
         sub_command.add_argument("id", help='id')
 
+        sub_command = self.add_sub_command(subparser, 'dump-lvstore','Dump lvstore data')
+        sub_command.add_argument("id", help='id')
+
         # check lvol
         #
         # ----------------- cluster -----------------
@@ -904,6 +907,9 @@ class CLIWrapper:
             elif sub_command == "make-primary":
                 id = args.id
                 ret = storage_ops.make_sec_new_primary(id)
+            elif sub_command == "dump-lvstore":
+                node_id = args.id
+                ret = storage_ops.dump_lvstore(node_id)
             else:
                 self.parser.print_help()
 

{sbcli_dev-4.0.53 → sbcli_dev-4.0.55}/simplyblock_core/controllers/caching_node_controller.py

@@ -399,7 +399,7 @@ def connect(caching_node_id, lvol_id):
     if lvol.ha_type == 'single':
         snode = db_controller.get_storage_node_by_id(lvol.node_id)
         for nic in snode.data_nics:
-            ret = rpc_client.bdev_nvme_attach_controller_tcp(rem_name, lvol.nqn, nic.ip4_address, "4420")
+            ret = rpc_client.bdev_nvme_attach_controller_tcp_caching(rem_name, lvol.nqn, nic.ip4_address, "4420")
             logger.debug(ret)
             if not ret:
                 logger.warning("Failed to connect to LVol")
@@ -409,7 +409,7 @@ def connect(caching_node_id, lvol_id):
         for nodes_id in lvol.nodes:
             snode = db_controller.get_storage_node_by_id(nodes_id)
             for nic in snode.data_nics:
-                ret = rpc_client.bdev_nvme_attach_controller_tcp(rem_name, lvol.nqn, nic.ip4_address, "4420")
+                ret = rpc_client.bdev_nvme_attach_controller_tcp_caching(rem_name, lvol.nqn, nic.ip4_address, "4420")
                 logger.debug(ret)
                 # if not ret:
                 #     logger.error("Failed to connect to LVol")
@@ -432,7 +432,7 @@ def connect(caching_node_id, lvol_id):
     ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', lvol.get_id())
     ret = rpc_client.transport_list("TCP")
     if not ret:
-        ret = rpc_client.transport_create("TCP")
+        ret = rpc_client.transport_create_caching("TCP")
     ret = rpc_client.listeners_create(subsystem_nqn, "TCP", '127.0.0.1', "4420")
     ret = rpc_client.nvmf_subsystem_listener_set_ana_state(subsystem_nqn, '127.0.0.1', "4420", is_optimized=True)
 

{sbcli_dev-4.0.53 → sbcli_dev-4.0.55}/simplyblock_core/rpc_client.py

@@ -152,6 +152,12 @@ class RPCClient:
         }
         return self._request("nvmf_create_transport", params)
 
+    def transport_create_caching(self, trtype):
+        params = {
+            "trtype": trtype,
+        }
+        return self._request("nvmf_create_transport", params)
+
     def listeners_list(self, nqn):
         params = {"nqn": nqn}
         return self._request("nvmf_subsystem_get_listeners", params)
@@ -824,3 +830,10 @@ class RPCClient:
             "level": level
         }
         return self._request("log_set_print_level", params)
+
+    def bdev_lvs_dump(self, lvs_name, file):
+        params = {
+            "lvs_name": lvs_name,
+            "file": file,
+        }
+        return self._request("bdev_lvs_dump", params)

{sbcli_dev-4.0.53 → sbcli_dev-4.0.55}/simplyblock_core/snode_client.py

@@ -130,3 +130,6 @@ class SNodeClient:
 
     def spdk_process_is_up(self):
         return self._request("GET", "spdk_process_is_up")
+
+    def get_file_content(self, file_name):
+        return self._request("GET", f"get_file_content/{file_name}")

{sbcli_dev-4.0.53 → sbcli_dev-4.0.55}/simplyblock_core/storage_node_ops.py

@@ -1763,6 +1763,10 @@ def restart_storage_node(
         if not ret:
             return False, "Failed to recreate lvstore on node"
 
+    logger.info("Dumping lvstore data")
+    ret = dump_lvstore(node_id)
+    print(ret)
+
     logger.info("Starting migration tasks")
     for dev in snode.nvme_devices:
         if dev.status != NVMeDevice.STATUS_ONLINE:
@@ -1923,6 +1927,10 @@ def shutdown_storage_node(node_id, force=False):
         rpc_client = RPCClient(
             snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password, timeout=10, retry=1)
 
+        logger.info("Dumping lvstore data")
+        ret = dump_lvstore(node_id)
+        print(ret)
+
         logger.debug("Removing LVols")
         _remove_bdev_stack(snode.lvstore_stack, rpc_client, remove_distr_only=True)
 
@@ -2875,3 +2883,27 @@ def make_sec_new_primary(node_id):
     snode.primary_ip = snode.mgmt_ip
     snode.write_to_db(db_controller.kv_store)
     return True
+
+
+def dump_lvstore(node_id):
+    db_controller = DBController()
+
+    snode = db_controller.get_storage_node_by_id(node_id)
+    if not snode:
+        logger.error(f"Can not find storage node: {node_id}")
+        return False
+
+    rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
+    logger.info(f"Dumping lvstore data on node: {snode.get_id()}")
+    file_name = f"LVS_dump_{snode.hostname}_{snode.lvstore}_{str(datetime.datetime.now().isoformat())}.txt"
+    file_path = f"/etc/simplyblock/{file_name}"
+    ret = rpc_client.bdev_lvs_dump(snode.lvstore, file_path)
+    if not ret:
+        logger.error("faild to dump lvstore data")
+        return False
+
+    logger.info(f"LVS dump file path: {file_name}")
+    snode_api = SNodeClient(f"{snode.mgmt_ip}:5000")
+    file_content, _ = snode_api.get_file_content(file_name)
+
+    return json.dumps(file_content, indent=2)

{sbcli_dev-4.0.53 → sbcli_dev-4.0.55}/simplyblock_web/blueprints/snode_ops.py

@@ -244,6 +244,11 @@ def get_cluster_id():
     out, _, _ = node_utils.run_command(f"cat {cluster_id_file}")
     return out
 
+@bp.route('/get_file_content/<string:file_name>', methods=['GET'])
+def get_file_content(file_name):
+    out, err, _ = node_utils.run_command(f"cat /etc/simplyblock/{file_name}")
+    return utils.get_response(out, err)
+
 
 def set_cluster_id(cluster_id):
     out, _, _ = node_utils.run_command(f"echo {cluster_id} > {cluster_id_file}")