sbcli-dev 10.5.4__tar.gz → 10.5.6__tar.gz

{sbcli_dev-10.5.4 → sbcli_dev-10.5.6}/PKG-INFO

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

{sbcli_dev-10.5.4 → sbcli_dev-10.5.6}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.5.4 → sbcli_dev-10.5.6}/simplyblock_cli/cli.py

@@ -58,7 +58,7 @@ class CLIWrapper:
         sub_command.add_argument("--disable-ha-jm", help='Disable HA JM for distrib creation', action='store_false', dest='enable_ha_jm', default=True)
         sub_command.add_argument("--is-secondary-node", help='add as secondary node', action='store_true', dest='is_secondary_node', default=False)
         sub_command.add_argument("--namespace", help='k8s namespace to deploy on',)
-
+        sub_command.add_argument("--id-device-by-nqn", help='Use device nqn to identify it instead of serial number', action='store_true', dest='id_device_by_nqn', default=False)
 
         # delete storage node
         sub_command = self.add_sub_command(subparser, "delete", 'Delete storage node obj')
@@ -798,6 +798,7 @@ class CLIWrapper:
                     number_of_distribs=number_of_distribs,
                     enable_ha_jm=enable_ha_jm,
                     is_secondary_node=args.is_secondary_node,
+                    id_device_by_nqn=args.id_device_by_nqn,
                 )
 
                 return out

{sbcli_dev-10.5.4 → sbcli_dev-10.5.6}/simplyblock_core/env_var

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

{sbcli_dev-10.5.4 → sbcli_dev-10.5.6}/simplyblock_core/models/storage_node.py

@@ -35,6 +35,7 @@ class StorageNode(BaseNodeObject):
     hostname: str = ""
     hugepages: int = 0
     ib_devices: List[IFace] = []
+    id_device_by_nqn: bool = False
     iobuf_large_bufsize: int = 0
     iobuf_large_pool_count: int = 0
     iobuf_small_bufsize: int = 0

{sbcli_dev-10.5.4 → sbcli_dev-10.5.6}/simplyblock_core/services/tasks_runner_new_dev_migration.py

@@ -32,7 +32,7 @@ def task_runner(task):
         task.write_to_db(db_controller.kv_store)
         return True
 
-    if task.status in [JobSchedule.STATUS_NEW ,JobSchedule.STATUS_SUSPENDED]:
+    if task.status in [JobSchedule.STATUS_NEW, JobSchedule.STATUS_SUSPENDED]:
         if task.status == JobSchedule.STATUS_NEW:
             for node in db_controller.get_storage_nodes_by_cluster_id(task.cluster_id):
                 if node.online_since:
@@ -58,17 +58,20 @@ def task_runner(task):
         return False
 
     rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password, timeout=5, retry=2)
+    all_devs_online = True
+    all_devs_online_or_failed = True
+    for node in db_controller.get_storage_nodes_by_cluster_id(task.cluster_id):
+        for dev in node.nvme_devices:
+            if dev.status == NVMeDevice.STATUS_FAILED:
+                all_devs_online = False
+            elif dev.status not in [NVMeDevice.STATUS_ONLINE,
+                                  NVMeDevice.STATUS_FAILED_AND_MIGRATED]:
+                all_devs_online_or_failed = False
+                all_devs_online = False
+                break
+
     if "migration" not in task.function_params:
-        all_devs_online = True
-        for node in db_controller.get_storage_nodes_by_cluster_id(task.cluster_id):
-            for dev in node.nvme_devices:
-                if dev.status not in [NVMeDevice.STATUS_ONLINE,
-                                      NVMeDevice.STATUS_FAILED,
-                                      NVMeDevice.STATUS_FAILED_AND_MIGRATED]:
-                    all_devs_online = False
-                    break
-
-        if not all_devs_online:
+        if not all_devs_online_or_failed:
             task.function_result = "Some devs are offline, retrying"
             task.retry += 1
             task.status = JobSchedule.STATUS_SUSPENDED
@@ -102,10 +105,10 @@ def task_runner(task):
         time.sleep(3)
 
     if "migration" in task.function_params:
-
+        allowed_error_codes = list(range(1, 8)) if not all_devs_online else [0]
         mig_info = task.function_params["migration"]
         res = rpc_client.distr_migration_status(**mig_info)
-        return utils.handle_task_result(task, res, allowed_error_codes=list(range(1, 8)))
+        return utils.handle_task_result(task, res, allowed_error_codes=allowed_error_codes)
     else:
         task.retry += 1
         task.write_to_db(db_controller.kv_store)

{sbcli_dev-10.5.4 → sbcli_dev-10.5.6}/simplyblock_core/storage_node_ops.py

@@ -126,6 +126,11 @@ def addNvmeDevices(snode, devs):
             model_number = nvme_driver_data['ctrlr_data']['model_number']
             total_size = nvme_dict['block_size'] * nvme_dict['num_blocks']
 
+            serial_number = nvme_driver_data['ctrlr_data']['serial_number']
+            if snode.id_device_by_nqn:
+                subnqn = nvme_driver_data['ctrlr_data']['subnqn']
+                serial_number = subnqn.split(":")[-1] + "_" + nvme_driver_data['ctrlr_data']['cntlid']
+
             devices.append(
                 NVMeDevice({
                     'uuid': str(uuid.uuid4()),
@@ -134,7 +139,7 @@ def addNvmeDevices(snode, devs):
                     'physical_label': next_physical_label,
                     'pcie_address': nvme_driver_data['pci_address'],
                     'model_id': model_number,
-                    'serial_number': nvme_driver_data['ctrlr_data']['serial_number'],
+                    'serial_number': serial_number,
                     'nvme_bdev': nvme_bdev,
                     'nvme_controller': nvme_controller,
                     'node_id': snode.get_id(),
@@ -926,7 +931,7 @@ 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):
+             namespace=None, number_of_distribs=2, enable_ha_jm=False, is_secondary_node=False, id_device_by_nqn=False):
 
     db_controller = DBController()
     kv_store = db_controller.kv_store
@@ -1205,6 +1210,7 @@ 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
 
     time.sleep(10)