sbcli-dev 4.0.35__zip → 4.0.37__zip

{sbcli_dev-4.0.35 → sbcli_dev-4.0.37}/PKG-INFO

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

{sbcli_dev-4.0.35 → sbcli_dev-4.0.37}/env_var

@@ -1,6 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=4.0.35
-
+SIMPLY_BLOCK_VERSION=4.0.37
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main-dev

{sbcli_dev-4.0.35 → sbcli_dev-4.0.37}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.35 → sbcli_dev-4.0.37}/simplyblock_core/controllers/tasks_controller.py

@@ -84,7 +84,7 @@ def add_device_mig_task(device_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']})
+                          max_retry=-1, function_params={'distr_name': bdev['name']})
     return True
 
 
@@ -110,11 +110,16 @@ def list_tasks(cluster_id, is_json=False):
         return json.dumps(data, indent=2)
 
     for task in tasks:
+        if task.max_retry > 0:
+            retry = f"{task.retry}/{task.max_retry}"
+        else:
+            retry = f"{task.retry}"
+
         data.append({
             "Task ID": task.uuid,
             "Node ID / Device ID": f"{task.node_id}\n{task.device_id}",
             "Function": task.function_name,
-            "Retry": f"{task.retry}/{task.max_retry}",
+            "Retry": retry,
             "Status": task.status,
             "Result": task.function_result,
             "Date": time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(task.date)),
@@ -173,7 +178,7 @@ def add_device_failed_mig_task(device_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']})
+                          max_retry=-1, function_params={'distr_name': bdev['name']})
     return True
 
 
@@ -185,7 +190,7 @@ def add_new_device_mig_task(device_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']})
+                          max_retry=-1, function_params={'distr_name': bdev['name']})
     return True
 
 

{sbcli_dev-4.0.35 → sbcli_dev-4.0.37}/simplyblock_core/models/job_schedule.py

@@ -30,7 +30,7 @@ class JobSchedule(BaseModel):
         "function_result": {"type": str, 'default': ""},
 
         "retry": {"type": int, 'default': 0},
-        "max_retry": {"type": int, 'default': 0},
+        "max_retry": {"type": int, 'default': -1},
         "status": {"type": str, 'default': ""},
 
     }

{sbcli_dev-4.0.35 → sbcli_dev-4.0.37}/simplyblock_core/services/tasks_runner_migration.py

@@ -33,6 +33,7 @@ def task_runner(task):
         task.status = JobSchedule.STATUS_RUNNING
         task.write_to_db(db_controller.kv_store)
         tasks_events.task_updated(task)
+        time.sleep(30)
 
     if snode.status != StorageNode.STATUS_ONLINE:
         task.function_result = "node is not online, retrying"

{sbcli_dev-4.0.35 → sbcli_dev-4.0.37}/simplyblock_core/storage_node_ops.py

@@ -744,8 +744,8 @@ def _prepare_cluster_devices_on_restart(snode):
                 logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
                 return False
 
-        device_controller.set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_ONLINE)
-        return True
+    device_controller.set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_ONLINE)
+    return True
 
 
 def _connect_to_remote_devs(this_node):
@@ -1726,9 +1726,6 @@ def restart_storage_node(
     logger.info("Setting node status to Online")
     set_node_status(node_id, StorageNode.STATUS_ONLINE)
 
-
-    time.sleep(5)
-
     # make other nodes connect to the new devices
     logger.info("Make other nodes connect to the node devices")
     snodes = db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id)
@@ -1744,13 +1741,6 @@ def restart_storage_node(
     for dev in snode.nvme_devices:
         distr_controller.send_dev_status_event(dev, dev.status)
 
-    logger.info("Starting migration tasks")
-    for dev in snode.nvme_devices:
-        if dev.status != NVMeDevice.STATUS_ONLINE:
-            logger.debug(f"Device is not online: {dev.get_id()}, status: {dev.status}")
-            continue
-        tasks_controller.add_device_mig_task(dev.get_id())
-
     time.sleep(5)
 
     if cluster.status != cluster.STATUS_ACTIVE:
@@ -1766,6 +1756,13 @@ def restart_storage_node(
         if not ret:
             return False, "Failed to recreate lvstore on node"
 
+    logger.info("Starting migration tasks")
+    for dev in snode.nvme_devices:
+        if dev.status != NVMeDevice.STATUS_ONLINE:
+            logger.debug(f"Device is not online: {dev.get_id()}, status: {dev.status}")
+            continue
+        tasks_controller.add_device_mig_task(dev.get_id())
+
     logger.info("Done")
     return "Success"