sbcli-dev 3.8.43__zip → 3.8.45__zip

{sbcli_dev-3.8.43 → sbcli_dev-3.8.45}/PKG-INFO

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

{sbcli_dev-3.8.43 → sbcli_dev-3.8.45}/env_var

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

{sbcli_dev-3.8.43 → sbcli_dev-3.8.45}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.43 → sbcli_dev-3.8.45}/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
 
 
@@ -110,7 +111,7 @@ def get_active_node_restart_task(cluster_id, node_id):
     tasks = db_controller.get_job_tasks(cluster_id)
     for task in tasks:
         if task.function_name == JobSchedule.FN_NODE_RESTART and task.node_id == node_id:
-            if task.status != JobSchedule.STATUS_DONE and task.canceled is False:
+            if task.status == JobSchedule.STATUS_RUNNING and task.canceled is False:
                 return task.uuid
     return False
 
@@ -119,7 +120,7 @@ def get_active_dev_restart_task(cluster_id, device_id):
     tasks = db_controller.get_job_tasks(cluster_id)
     for task in tasks:
         if task.function_name == JobSchedule.FN_DEV_RESTART and task.device_id == device_id:
-            if task.status != JobSchedule.STATUS_DONE and task.canceled is False:
+            if task.status == JobSchedule.STATUS_RUNNING and task.canceled is False:
                 return task.uuid
     return False
 
@@ -129,7 +130,7 @@ def get_active_node_mig_task(cluster_id, node_id):
     for task in tasks:
         if task.function_name in [JobSchedule.FN_FAILED_DEV_MIG, JobSchedule.FN_DEV_MIG,
                                   JobSchedule.FN_NEW_DEV_MIG] and task.node_id == node_id:
-            if task.status != JobSchedule.STATUS_DONE and task.canceled is False:
+            if task.status == JobSchedule.STATUS_RUNNING and task.canceled is False:
                 return task.uuid
     return False
 
@@ -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
 
 
@@ -160,6 +163,6 @@ def get_active_node_task(cluster_id, node_id):
     tasks = db_controller.get_job_tasks(cluster_id)
     for task in tasks:
         if task.node_id == node_id:
-            if task.status != JobSchedule.STATUS_DONE and task.canceled is False:
+            if task.status == JobSchedule.STATUS_RUNNING and task.canceled is False:
                 return task.uuid
     return False

{sbcli_dev-3.8.43 → sbcli_dev-3.8.45}/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.43 → sbcli_dev-3.8.45}/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.43 → sbcli_dev-3.8.45}/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)