sbcli-dev 4.0.0__zip → 4.0.2__zip

{sbcli_dev-4.0.0 → sbcli_dev-4.0.2}/PKG-INFO

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

{sbcli_dev-4.0.0 → sbcli_dev-4.0.2}/env_var

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

{sbcli_dev-4.0.0 → sbcli_dev-4.0.2}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.0 → sbcli_dev-4.0.2}/simplyblock_core/constants.py

@@ -57,7 +57,7 @@ SIMPLY_BLOCK_CLI_NAME = "sbcli-dev"
 TASK_EXEC_INTERVAL_SEC = 30
 TASK_EXEC_RETRY_COUNT = 8
 
-SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:feature-journal-ha-latest"
+SIMPLY_BLOCK_SPDK_ULTRA_IMAGE = "simplyblock/spdk:main-latest"
 
 GELF_PORT = 12201
 

{sbcli_dev-4.0.0 → sbcli_dev-4.0.2}/simplyblock_core/controllers/tasks_controller.py

@@ -47,6 +47,11 @@ def _add_task(function_name, cluster_id, node_id, device_id,
         if task_id:
             logger.info(f"Task found, skip adding new task: {task_id}")
             return False
+    elif function_name == JobSchedule.FN_NEW_DEV_MIG:
+        task_id = get_new_device_mig_task(cluster_id, node_id, function_params['distr_name'])
+        if task_id:
+            logger.info(f"Task found, skip adding new task: {task_id}")
+            return False
 
     task_obj = JobSchedule()
     task_obj.uuid = str(uuid.uuid4())
@@ -186,3 +191,12 @@ def get_active_node_task(cluster_id, node_id):
             if task.status == JobSchedule.STATUS_RUNNING and task.canceled is False:
                 return task.uuid
     return False
+
+def get_new_device_mig_task(cluster_id, node_id, distr_name):
+    tasks = db_controller.get_job_tasks(cluster_id)
+    for task in tasks:
+        if task.function_name == JobSchedule.FN_NEW_DEV_MIG and task.node_id == node_id:
+            if task.status != JobSchedule.STATUS_DONE and task.canceled is False \
+                    and "distr_name" in task.function_params and task.function_params["distr_name"] == distr_name:
+                return task.uuid
+    return False

{sbcli_dev-4.0.0 → sbcli_dev-4.0.2}/simplyblock_core/controllers/tasks_events.py

@@ -25,13 +25,16 @@ def task_create(task, caused_by=ec.CAUSED_BY_CLI):
 
 
 def task_updated(task, caused_by=ec.CAUSED_BY_CLI):
-    _task_event(task, f"Task updated: {task.uuid}", caused_by, ec.EVENT_STATUS_CHANGE)
+    return
+    # _task_event(task, f"Task updated: {task.uuid}", caused_by, ec.EVENT_STATUS_CHANGE)
 
 
 def task_status_change(task, new_state, old_status, caused_by=ec.CAUSED_BY_CLI):
-    _task_event(task, f"task status changed from: {old_status} to: {new_state}", caused_by, ec.EVENT_STATUS_CHANGE)
+    return
+    # _task_event(task, f"task status changed from: {old_status} to: {new_state}", caused_by, ec.EVENT_STATUS_CHANGE)
 
 
 def task_canceled(task, caused_by=ec.CAUSED_BY_CLI):
-    _task_event(task, f"Task canceled: {task.uuid}", caused_by, ec.EVENT_STATUS_CHANGE)
+    return
+    # _task_event(task, f"Task canceled: {task.uuid}", caused_by, ec.EVENT_STATUS_CHANGE)
 

{sbcli_dev-4.0.0 → sbcli_dev-4.0.2}/simplyblock_core/services/tasks_runner_restart.py

@@ -172,12 +172,13 @@ def task_runner_node(task):
         task.write_to_db(db_controller.kv_store)
         return False
 
+
     # shutting down node
     logger.info(f"Shutdown node {node.get_id()}")
     ret = storage_node_ops.shutdown_storage_node(node.get_id(), force=True)
     if ret:
         logger.info(f"Node shutdown succeeded")
-    time.sleep(3)
+    time.sleep(60)
 
     # resetting node
     logger.info(f"Restart node {node.get_id()}")

{sbcli_dev-4.0.0 → sbcli_dev-4.0.2}/simplyblock_core/storage_node_ops.py

@@ -1683,6 +1683,10 @@ def restart_storage_node(
         logger.info("Connecting to remote JMs")
         snode.remote_jm_devices = _connect_to_remote_jm_devs(snode)
 
+    logger.info(f"Sending device status event")
+    for dev in snode.nvme_devices:
+        distr_controller.send_dev_status_event(dev, dev.status)
+
     logger.info("Setting node status to Online")
     set_node_status(node_id, StorageNode.STATUS_ONLINE)
 
@@ -1697,9 +1701,6 @@ def restart_storage_node(
             node.remote_jm_devices = _connect_to_remote_jm_devs(node)
         node.write_to_db(kv_store)
 
-    logger.info(f"Sending device status event")
-    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: