sbcli-dev 5.0.3__zip → 5.0.5__zip

{sbcli_dev-5.0.3 → sbcli_dev-5.0.5}/PKG-INFO

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

{sbcli_dev-5.0.3 → sbcli_dev-5.0.5}/env_var

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

{sbcli_dev-5.0.3 → sbcli_dev-5.0.5}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-5.0.3 → sbcli_dev-5.0.5}/simplyblock_core/controllers/tasks_controller.py

@@ -227,10 +227,10 @@ def get_device_mig_task(cluster_id, node_id, distr_name):
     return False
 
 
-def get_failed_device_mig_task(cluster_id, device_id):
+def get_new_device_mig_task_for_device(cluster_id):
     tasks = db_controller.get_job_tasks(cluster_id)
     for task in tasks:
-        if task.function_name == JobSchedule.FN_FAILED_DEV_MIG and  task.device_id == device_id:
+        if task.function_name == JobSchedule.FN_NEW_DEV_MIG:
             if task.status != JobSchedule.STATUS_DONE and task.canceled is False:
                 return task.uuid
     return False

{sbcli_dev-5.0.3 → sbcli_dev-5.0.5}/simplyblock_core/services/tasks_runner_failed_migration.py

@@ -44,6 +44,16 @@ def task_runner(task):
         task.write_to_db(db_controller.kv_store)
         return False
 
+    active_f_task = tasks_controller.get_new_device_mig_task_for_device(task.cluster_id)
+    if active_f_task:
+        msg = "dev expansion task found, retry"
+        logger.info(msg)
+        task.function_result = msg
+        task.retry += 1
+        task.status = JobSchedule.STATUS_SUSPENDED
+        task.write_to_db(db_controller.kv_store)
+        return False
+
     rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password,
                            timeout=5, retry=2)
     if "migration" not in task.function_params:

{sbcli_dev-5.0.3 → sbcli_dev-5.0.5}/simplyblock_core/services/tasks_runner_new_dev_migration.py

@@ -60,16 +60,6 @@ def task_runner(task):
             task.write_to_db(db_controller.kv_store)
             return False
 
-        active_f_task = tasks_controller.get_failed_device_mig_task(task.cluster_id, task.device_id)
-        if active_f_task:
-            msg = "failure task found, retry"
-            logger.info(msg)
-            task.function_result = msg
-            task.retry += 1
-            task.status = JobSchedule.STATUS_SUSPENDED
-            task.write_to_db(db_controller.kv_store)
-            return False
-
         device = db_controller.get_storage_devices(task.device_id)
         distr_name = task.function_params["distr_name"]
 

{sbcli_dev-5.0.3 → sbcli_dev-5.0.5}/simplyblock_core/storage_node_ops.py

@@ -1725,6 +1725,7 @@ def restart_storage_node(
             logger.error("Failed to prepare cluster devices")
             # return False
         snode.nvme_devices.extend(removed_devices)
+        snode.write_to_db(kv_store)
 
         for node in db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id):
             if node.status == StorageNode.STATUS_ONLINE:
@@ -1735,8 +1736,7 @@ def restart_storage_node(
         if not ret:
             logger.error("Failed to prepare cluster devices")
             # return False
-
-    snode.write_to_db(kv_store)
+        snode.write_to_db(kv_store)
 
     logger.info("Connecting to remote devices")
     remote_devices = _connect_to_remote_devs(snode)