sbcli-dev 5.0.0__zip → 5.0.2__zip

{sbcli_dev-5.0.0 → sbcli_dev-5.0.2}/PKG-INFO

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

{sbcli_dev-5.0.0 → sbcli_dev-5.0.2}/env_var

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

{sbcli_dev-5.0.0 → sbcli_dev-5.0.2}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-5.0.0 → sbcli_dev-5.0.2}/simplyblock_core/controllers/tasks_controller.py

@@ -225,3 +225,13 @@ def get_device_mig_task(cluster_id, node_id, distr_name):
                     and "distr_name" in task.function_params and task.function_params["distr_name"] == distr_name:
                 return task.uuid
     return False
+
+
+def get_failed_device_mig_task(cluster_id, device_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.status != JobSchedule.STATUS_DONE and task.canceled is False:
+                return task.uuid
+    return False
+

{sbcli_dev-5.0.0 → sbcli_dev-5.0.2}/simplyblock_core/services/tasks_runner_failed_migration.py

@@ -79,7 +79,6 @@ def task_runner(task):
             migration_status = res_data["status"]
             if migration_status == "completed":
                 if res_data['error'] == 0:
-                    device_controller.device_set_failed_and_migrated(task.device_id)
                     task.function_result = "Done"
                     task.status = JobSchedule.STATUS_DONE
                 else:
@@ -88,6 +87,11 @@ def task_runner(task):
                     task.retry += 1
                     del task.function_params["migration"]
                 task.write_to_db(db_controller.kv_store)
+
+                dev_failed_task = tasks_controller.get_failed_device_mig_task( task.cluster_id, task.device_id)
+                if not dev_failed_task:
+                    device_controller.device_set_failed_and_migrated(task.device_id)
+
                 return True
 
             elif migration_status == "failed":

{sbcli_dev-5.0.0 → sbcli_dev-5.0.2}/simplyblock_core/services/tasks_runner_new_dev_migration.py

@@ -60,6 +60,16 @@ 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.0 → sbcli_dev-5.0.2}/simplyblock_core/storage_node_ops.py

@@ -1725,6 +1725,12 @@ def restart_storage_node(
             logger.error("Failed to prepare cluster devices")
             # return False
         snode.nvme_devices.extend(removed_devices)
+
+        if new_devices:
+            for node in db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id):
+                if node.status == StorageNode.STATUS_ONLINE:
+                    send_cluster_map(node.get_id())
+
     else:
         ret = _prepare_cluster_devices_on_restart(snode)
         if not ret:
@@ -2914,6 +2920,7 @@ def make_sec_new_primary(node_id):
         if node.status == StorageNode.STATUS_ONLINE:
             send_cluster_map(node.get_id())
 
+    time.sleep(5)
     for dev in snode.nvme_devices:
         if dev.status == NVMeDevice.STATUS_REMOVED:
             device_controller.device_set_failed(dev.get_id())