sbcli-dev 3.8.31__zip → 3.8.33__zip

{sbcli_dev-3.8.31 → sbcli_dev-3.8.33}/PKG-INFO

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

{sbcli_dev-3.8.31 → sbcli_dev-3.8.33}/env_var

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

{sbcli_dev-3.8.31 → sbcli_dev-3.8.33}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.31 → sbcli_dev-3.8.33}/simplyblock_cli/cli.py

@@ -142,6 +142,13 @@ class CLIWrapper:
             'io_error_on_unmap', 'io_error_on_all', 'discard_io_all',
             'hotplug_removal'], default='full_pass_through')
 
+        sub_command = self.add_sub_command(subparser, "jm-device-testing-mode", 'Set device testing mode')
+        sub_command.add_argument("device_id", help='Device UUID')
+        sub_command.add_argument("mode", help='Testing mode', choices=[
+            'full_pass_through', 'io_error_on_read', 'io_error_on_write',
+            'io_error_on_unmap', 'io_error_on_all', 'discard_io_all',
+            'hotplug_removal'], default='full_pass_through')
+
         sub_command = self.add_sub_command(subparser, "get-device", 'Get storage device by id')
         sub_command.add_argument("device_id", help='the devices\'s UUID')
 
@@ -770,6 +777,8 @@ class CLIWrapper:
 
             elif sub_command == "device-testing-mode":
                 ret = device_controller.set_device_testing_mode(args.device_id, args.mode)
+            elif sub_command == "jm-device-testing-mode":
+                ret = device_controller.set_jm_device_testing_mode(args.device_id, args.mode)
 
             elif sub_command == "remove-device":
                 ret = device_controller.device_remove(args.device_id, args.force)

{sbcli_dev-3.8.31 → sbcli_dev-3.8.33}/simplyblock_core/controllers/device_controller.py

@@ -276,6 +276,28 @@ def set_device_testing_mode(device_id, mode):
     return ret
 
 
+def set_jm_device_testing_mode(device_id, mode):
+    db_controller = DBController()
+    snode = db_controller.get_storage_by_jm_id(device_id)
+    if not snode:
+        logger.error("node not found")
+        return False
+    jm_device = snode.jm_device
+
+    if not snode.enable_test_device:
+        logger.error("Test device is disabled on this storage node")
+        return False
+
+    logger.info(f"Set device:{device_id} Test mode:{mode}")
+    # creating RPCClient instance
+    rpc_client = RPCClient(
+        snode.mgmt_ip, snode.rpc_port,
+        snode.rpc_username, snode.rpc_password)
+
+    ret = rpc_client.bdev_passtest_mode(jm_device.testing_bdev, mode)
+    return ret
+
+
 def device_remove(device_id, force=True):
     db_controller = DBController()
     dev = db_controller.get_storage_devices(device_id)

{sbcli_dev-3.8.31 → sbcli_dev-3.8.33}/simplyblock_core/kv_store.py

@@ -149,6 +149,13 @@ class DBController:
     def get_storage_devices(self, id):
         return self.get_storage_device_by_id(id)
 
+    def get_storage_by_jm_id(self, id):
+        nodes = self.get_storage_nodes()
+        for node in nodes:
+            if node.jm_device.get_id() == id:
+                return node
+
+
     # Compute node functions
     def get_compute_node_by_id(self, id):
         ret = ComputeNode().read_from_db(self.kv_store, id)

{sbcli_dev-3.8.31 → sbcli_dev-3.8.33}/simplyblock_core/models/nvme_device.py

@@ -105,6 +105,7 @@ class JMDevice(BaseModel):
         "raid_bdev": {"type": str, 'default': ""},
         "nvme_bdev": {"type": str, 'default': ""},
         "alceml_bdev": {"type": str, 'default': ""},
+        "testing_bdev": {"type": str, 'default': ""},
         "jm_bdev": {"type": str, 'default': ""},
         "device_data_dict": {"type": dict, 'default': {}},
 

{sbcli_dev-3.8.31 → sbcli_dev-3.8.33}/simplyblock_core/storage_node_ops.py

@@ -254,6 +254,7 @@ def _create_jm_stack_on_raid(rpc_client, jm_nvme_bdevs, snode, after_restart):
     alceml_name = f"alceml_jm_{snode.get_id()}"
 
     nvme_bdev = raid_bdev
+    test_name = ""
     if snode.enable_test_device:
         test_name = f"{raid_bdev}_test"
         ret = rpc_client.bdev_passtest_create(test_name, raid_bdev)
@@ -330,6 +331,7 @@ def _create_jm_stack_on_raid(rpc_client, jm_nvme_bdevs, snode, after_restart):
         'jm_nvme_bdev_list': jm_nvme_bdevs,
         'raid_bdev': raid_bdev,
         'alceml_bdev': alceml_name,
+        'testing_bdev': test_name,
         'jm_bdev': jm_bdev,
 
         'pt_bdev': pt_name,
@@ -345,6 +347,7 @@ def _create_jm_stack_on_device(rpc_client, nvme, snode, after_restart):
     logger.info(f"adding {alceml_name}")
 
     nvme_bdev = nvme.nvme_bdev
+    test_name = ""
     if snode.enable_test_device:
         test_name = f"{nvme.nvme_bdev}_test"
         ret = rpc_client.bdev_passtest_create(test_name, nvme.nvme_bdev)
@@ -420,6 +423,7 @@ def _create_jm_stack_on_device(rpc_client, nvme, snode, after_restart):
         "serial_number": nvme.serial_number,
         "device_data_dict": nvme.to_dict(),
         'jm_bdev': jm_bdev,
+        'testing_bdev': test_name,
 
         'pt_bdev': pt_name,
         'nvmf_nqn': subsystem_nqn,
@@ -667,12 +671,11 @@ def _prepare_cluster_devices_on_restart(snode):
     else:
         nvme_bdev = jm_device.nvme_bdev
         if snode.enable_test_device:
-            test_name = f"{jm_device.nvme_bdev}_test"
-            ret = rpc_client.bdev_passtest_create(test_name, jm_device.nvme_bdev)
+            ret = rpc_client.bdev_passtest_create(jm_device.testing_bdev, jm_device.nvme_bdev)
             if not ret:
-                logger.error(f"Failed to create passtest bdev {test_name}")
+                logger.error(f"Failed to create passtest bdev {jm_device.testing_bdev}")
                 return False
-            nvme_bdev = test_name
+            nvme_bdev = jm_device.testing_bdev
         alceml_cpu_mask = ""
         alceml_worker_cpu_mask = ""
 
@@ -2514,8 +2517,7 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
     size = max_size // snode.number_of_distribs
     distr_page_size = (ndcs + npcs) * page_size_in_blocks
     cluster_sz = ndcs * page_size_in_blocks
-    strip_size_kb = int((ndcs + npcs) * snode.number_of_distribs * 64)
-
+    strip_size_kb = int((ndcs + npcs) * 64)
     strip_size_kb = utils.nearest_upper_power_of_2(strip_size_kb)
     for _ in range(snode.number_of_distribs):
         distrib_vuid = utils.get_random_vuid()