sbcli-dev 3.8.44__zip → 3.8.46__zip

{sbcli_dev-3.8.44 → sbcli_dev-3.8.46}/PKG-INFO

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

{sbcli_dev-3.8.44 → sbcli_dev-3.8.46}/env_var

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

{sbcli_dev-3.8.44 → sbcli_dev-3.8.46}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.44 → sbcli_dev-3.8.46}/simplyblock_core/controllers/tasks_controller.py

@@ -56,9 +56,10 @@ def _add_task(function_name, cluster_id, node_id, device_id,
 def add_device_mig_task(device_id):
     device = db_controller.get_storage_devices(device_id)
     for node in db_controller.get_storage_nodes_by_cluster_id(device.cluster_id):
-        for lvol_id in node.lvols:
-            _add_task(JobSchedule.FN_DEV_MIG, device.cluster_id, node.get_id(), device.get_id(),
-                      max_retry=0, function_params={'lvol_id': lvol_id})
+        for bdev in node.lvstore_stack:
+            if bdev['type'] == "bdev_distr":
+                _add_task(JobSchedule.FN_DEV_MIG, device.cluster_id, node.get_id(), device.get_id(),
+                          max_retry=0, function_params={'distr_name': bdev['name']})
     return True
 
 
@@ -137,18 +138,20 @@ def get_active_node_mig_task(cluster_id, node_id):
 def add_device_failed_mig_task(device_id):
     device = db_controller.get_storage_devices(device_id)
     for node in db_controller.get_storage_nodes_by_cluster_id(device.cluster_id):
-        for lvol_id in node.lvols:
-            _add_task(JobSchedule.FN_FAILED_DEV_MIG, device.cluster_id, node.get_id(), device.get_id(),
-                      max_retry=0, function_params={'lvol_id': lvol_id})
+        for bdev in node.lvstore_stack:
+            if bdev['type'] == "bdev_distr":
+                _add_task(JobSchedule.FN_FAILED_DEV_MIG, device.cluster_id, node.get_id(), device.get_id(),
+                          max_retry=0, function_params={'distr_name': bdev['name']})
     return True
 
 
 def add_new_device_mig_task(device_id):
     device = db_controller.get_storage_devices(device_id)
     for node in db_controller.get_storage_nodes_by_cluster_id(device.cluster_id):
-        for lvol_id in node.lvols:
-            _add_task(JobSchedule.FN_NEW_DEV_MIG, device.cluster_id, node.get_id(), device.get_id(),
-                      max_retry=0, function_params={'lvol_id': lvol_id})
+        for bdev in node.lvstore_stack:
+            if bdev['type'] == "bdev_distr":
+                _add_task(JobSchedule.FN_NEW_DEV_MIG, device.cluster_id, node.get_id(), device.get_id(),
+                          max_retry=0, function_params={'distr_name': bdev['name']})
     return True
 
 

{sbcli_dev-3.8.44 → sbcli_dev-3.8.46}/simplyblock_core/services/tasks_runner_failed_migration.py

@@ -42,13 +42,7 @@ def task_runner(task):
 
     if "migration" not in task.function_params:
         device = db_controller.get_storage_devices(task.device_id)
-        lvol = db_controller.get_lvol_by_id(task.function_params["lvol_id"])
-
-        if not lvol:
-            task.status = JobSchedule.STATUS_DONE
-            task.function_result = "LVol not found"
-            task.write_to_db(db_controller.kv_store)
-            return True
+        distr_name = task.function_params["distr_name"]
 
         if not device:
             task.status = JobSchedule.STATUS_DONE
@@ -56,7 +50,7 @@ def task_runner(task):
             task.write_to_db(db_controller.kv_store)
             return True
 
-        rsp = rpc_client.distr_migration_failure_start(lvol.base_bdev, device.cluster_device_order)
+        rsp = rpc_client.distr_migration_failure_start(distr_name, device.cluster_device_order)
         if not rsp:
             logger.error(f"Failed to start device migration task, storage_ID: {device.cluster_device_order}")
             task.function_result = "Failed to start device migration task"
@@ -66,7 +60,7 @@ def task_runner(task):
 
         task.function_params = {
             "migration": {
-                "name": lvol.base_bdev}
+                "name": distr_name}
         }
         task.write_to_db(db_controller.kv_store)
         time.sleep(3)

{sbcli_dev-3.8.44 → sbcli_dev-3.8.46}/simplyblock_core/services/tasks_runner_migration.py

@@ -53,13 +53,7 @@ def task_runner(task):
             return False
 
         device = db_controller.get_storage_devices(task.device_id)
-        lvol = db_controller.get_lvol_by_id(task.function_params["lvol_id"])
-
-        if not lvol:
-            task.status = JobSchedule.STATUS_DONE
-            task.function_result = "LVol not found"
-            task.write_to_db(db_controller.kv_store)
-            return True
+        distr_name = task.function_params["distr_name"]
 
         if not device:
             task.status = JobSchedule.STATUS_DONE
@@ -67,7 +61,7 @@ def task_runner(task):
             task.write_to_db(db_controller.kv_store)
             return True
 
-        rsp = rpc_client.distr_migration_to_primary_start(device.cluster_device_order, lvol.base_bdev)
+        rsp = rpc_client.distr_migration_to_primary_start(device.cluster_device_order, distr_name)
         if not rsp:
             logger.error(f"Failed to start device migration task, storage_ID: {device.cluster_device_order}")
             task.function_result = "Failed to start device migration task"
@@ -75,7 +69,7 @@ def task_runner(task):
             task.write_to_db(db_controller.kv_store)
             return False
         task.function_params['migration'] = {
-            "name": lvol.base_bdev}
+            "name": distr_name}
         task.write_to_db(db_controller.kv_store)
         time.sleep(3)
 

{sbcli_dev-3.8.44 → sbcli_dev-3.8.46}/simplyblock_core/services/tasks_runner_new_dev_migration.py

@@ -56,13 +56,7 @@ def task_runner(task):
             return False
 
         device = db_controller.get_storage_devices(task.device_id)
-        lvol = db_controller.get_lvol_by_id(task.function_params["lvol_id"])
-
-        if not lvol:
-            task.status = JobSchedule.STATUS_DONE
-            task.function_result = "LVol not found"
-            task.write_to_db(db_controller.kv_store)
-            return True
+        distr_name = task.function_params["distr_name"]
 
         if not device:
             task.status = JobSchedule.STATUS_DONE
@@ -70,7 +64,7 @@ def task_runner(task):
             task.write_to_db(db_controller.kv_store)
             return True
 
-        rsp = rpc_client.distr_migration_expansion_start(lvol.base_bdev)
+        rsp = rpc_client.distr_migration_expansion_start(distr_name)
         if not rsp:
             logger.error(f"Failed to start device migration task, storage_ID: {device.cluster_device_order}")
             task.function_result = "Failed to start device migration task"
@@ -79,7 +73,7 @@ def task_runner(task):
             return False
 
         task.function_params['migration'] = {
-            "name": lvol.base_bdev
+            "name": distr_name
         }
         task.write_to_db(db_controller.kv_store)
         time.sleep(3)

{sbcli_dev-3.8.44 → sbcli_dev-3.8.46}/simplyblock_core/storage_node_ops.py

@@ -286,40 +286,42 @@ def _create_jm_stack_on_raid(rpc_client, jm_nvme_bdevs, snode, after_restart):
         logger.error(f"Failed to create {jm_bdev}")
         return False
 
-
     alceml_id = str(uuid.uuid4())
-    # add pass through
-    pt_name = f"{jm_bdev}_PT"
-    ret = rpc_client.bdev_PT_NoExcl_create(pt_name, jm_bdev)
-    if not ret:
-        logger.error(f"Failed to create pt noexcl bdev: {pt_name}")
-        return False
-
-    subsystem_nqn = snode.subsystem + ":dev:" + jm_bdev
-    logger.info("creating subsystem %s", subsystem_nqn)
-    ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', jm_bdev)
-    IP = None
-    for iface in snode.data_nics:
-        if iface.ip4_address:
-            tr_type = iface.get_transport_type()
-            ret = rpc_client.transport_list()
-            found = False
-            if ret:
-                for ty in ret:
-                    if ty['trtype'] == tr_type:
-                        found = True
-            if found is False:
-                ret = rpc_client.transport_create(tr_type)
-            logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
-            ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
-            IP = iface.ip4_address
-            break
-    logger.info(f"add {pt_name} to subsystem")
-    ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
-    if not ret:
-        logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
-        return False
+    pt_name = ""
+    subsystem_nqn = ""
+    IP = ""
+    if snode.enable_ha_jm:
+        # add pass through
+        pt_name = f"{jm_bdev}_PT"
+        ret = rpc_client.bdev_PT_NoExcl_create(pt_name, jm_bdev)
+        if not ret:
+            logger.error(f"Failed to create pt noexcl bdev: {pt_name}")
+            return False
 
+        subsystem_nqn = snode.subsystem + ":dev:" + jm_bdev
+        logger.info("creating subsystem %s", subsystem_nqn)
+        ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', jm_bdev)
+        IP = None
+        for iface in snode.data_nics:
+            if iface.ip4_address:
+                tr_type = iface.get_transport_type()
+                ret = rpc_client.transport_list()
+                found = False
+                if ret:
+                    for ty in ret:
+                        if ty['trtype'] == tr_type:
+                            found = True
+                if found is False:
+                    ret = rpc_client.transport_create(tr_type)
+                logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
+                ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
+                IP = iface.ip4_address
+                break
+        logger.info(f"add {pt_name} to subsystem")
+        ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
+        if not ret:
+            logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
+            return False
 
     ret = rpc_client.get_bdevs(raid_bdev)
 
@@ -380,38 +382,41 @@ def _create_jm_stack_on_device(rpc_client, nvme, snode, after_restart):
         logger.error(f"Failed to create {jm_bdev}")
         return False
 
-    # add pass through
-    pt_name = f"{jm_bdev}_PT"
-    ret = rpc_client.bdev_PT_NoExcl_create(pt_name, jm_bdev)
-    if not ret:
-        logger.error(f"Failed to create pt noexcl bdev: {pt_name}")
-        return False
-
-    subsystem_nqn = snode.subsystem + ":dev:" + jm_bdev
-    logger.info("creating subsystem %s", subsystem_nqn)
-    ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', jm_bdev)
-    IP = None
-    for iface in snode.data_nics:
-        if iface.ip4_address:
-            tr_type = iface.get_transport_type()
-            ret = rpc_client.transport_list()
-            found = False
-            if ret:
-                for ty in ret:
-                    if ty['trtype'] == tr_type:
-                        found = True
-            if found is False:
-                ret = rpc_client.transport_create(tr_type)
-            logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
-            ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
-            IP = iface.ip4_address
-            break
-    logger.info(f"add {pt_name} to subsystem")
-    ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
-    if not ret:
-        logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
-        return False
+    pt_name = ""
+    subsystem_nqn = ""
+    IP = ""
+    if snode.enable_ha_jm:
+        # add pass through
+        pt_name = f"{jm_bdev}_PT"
+        ret = rpc_client.bdev_PT_NoExcl_create(pt_name, jm_bdev)
+        if not ret:
+            logger.error(f"Failed to create pt noexcl bdev: {pt_name}")
+            return False
 
+        subsystem_nqn = snode.subsystem + ":dev:" + jm_bdev
+        logger.info("creating subsystem %s", subsystem_nqn)
+        ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', jm_bdev)
+        IP = None
+        for iface in snode.data_nics:
+            if iface.ip4_address:
+                tr_type = iface.get_transport_type()
+                ret = rpc_client.transport_list()
+                found = False
+                if ret:
+                    for ty in ret:
+                        if ty['trtype'] == tr_type:
+                            found = True
+                if found is False:
+                    ret = rpc_client.transport_create(tr_type)
+                logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
+                ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
+                IP = iface.ip4_address
+                break
+        logger.info(f"add {pt_name} to subsystem")
+        ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
+        if not ret:
+            logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
+            return False
 
     return JMDevice({
         'uuid': alceml_id,
@@ -701,37 +706,38 @@ def _prepare_cluster_devices_on_restart(snode):
             logger.error(f"Failed to create {jm_bdev}")
             return False
 
-        # add pass through
-        pt_name = f"{jm_bdev}_PT"
-        ret = rpc_client.bdev_PT_NoExcl_create(pt_name, jm_bdev)
-        if not ret:
-            logger.error(f"Failed to create pt noexcl bdev: {pt_name}")
-            return False
+        if snode.enable_ha_jm:
+            # add pass through
+            pt_name = f"{jm_bdev}_PT"
+            ret = rpc_client.bdev_PT_NoExcl_create(pt_name, jm_bdev)
+            if not ret:
+                logger.error(f"Failed to create pt noexcl bdev: {pt_name}")
+                return False
 
-        subsystem_nqn = snode.subsystem + ":dev:" + jm_bdev
-        logger.info("creating subsystem %s", subsystem_nqn)
-        ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', jm_bdev)
-        IP = None
-        for iface in snode.data_nics:
-            if iface.ip4_address:
-                tr_type = iface.get_transport_type()
-                ret = rpc_client.transport_list()
-                found = False
-                if ret:
-                    for ty in ret:
-                        if ty['trtype'] == tr_type:
-                            found = True
-                if found is False:
-                    ret = rpc_client.transport_create(tr_type)
-                logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
-                ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
-                IP = iface.ip4_address
-                break
-        logger.info(f"add {pt_name} to subsystem")
-        ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
-        if not ret:
-            logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
-            return False
+            subsystem_nqn = snode.subsystem + ":dev:" + jm_bdev
+            logger.info("creating subsystem %s", subsystem_nqn)
+            ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', jm_bdev)
+            IP = None
+            for iface in snode.data_nics:
+                if iface.ip4_address:
+                    tr_type = iface.get_transport_type()
+                    ret = rpc_client.transport_list()
+                    found = False
+                    if ret:
+                        for ty in ret:
+                            if ty['trtype'] == tr_type:
+                                found = True
+                    if found is False:
+                        ret = rpc_client.transport_create(tr_type)
+                    logger.info("adding listener for %s on IP %s" % (subsystem_nqn, iface.ip4_address))
+                    ret = rpc_client.listeners_create(subsystem_nqn, tr_type, iface.ip4_address, "4420")
+                    IP = iface.ip4_address
+                    break
+            logger.info(f"add {pt_name} to subsystem")
+            ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
+            if not ret:
+                logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
+                return False
 
     return True