sbcli-pre 1.1.1__zip → 1.1.3__zip

{sbcli_pre-1.1.1 → sbcli_pre-1.1.3}/PKG-INFO

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

{sbcli_pre-1.1.1 → sbcli_pre-1.1.3}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=1.1.1
+SIMPLY_BLOCK_VERSION=1.1.3
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:pre-release
 

{sbcli_pre-1.1.1 → sbcli_pre-1.1.3}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.1.1 → sbcli_pre-1.1.3}/simplyblock_core/services/tasks_runner_migration.py

@@ -54,6 +54,8 @@ while True:
                 if task.function_name == JobSchedule.FN_DEV_MIG:
                     while task.status != JobSchedule.STATUS_DONE:
                         res = task_runner(task)
-                        if res is False:
+                        if res:
+                            tasks_events.task_updated(task)
+                        else:
                             time.sleep(delay_seconds)
                             delay_seconds *= 2

{sbcli_pre-1.1.1 → sbcli_pre-1.1.3}/simplyblock_core/services/tasks_runner_restart.py

@@ -81,15 +81,15 @@ def task_runner_device(task):
 
     node = db_controller.get_storage_node_by_id(task.node_id)
     if node.status != StorageNode.STATUS_ONLINE:
-        logger.error(f"Node is not online: {node.get_id()} , skipping task: {task.get_id()}")
+        logger.error(f"Node is not online: {node.get_id()}, retry")
         task.function_result = "Node is offline"
         task.retry += 1
         task.write_to_db(db_controller.kv_store)
         return False
 
     if device.status == NVMeDevice.STATUS_ONLINE and device.io_error is False:
-        logger.info(f"Device is online: {device.get_id()}, no restart needed")
-        task.function_result = "skipped because dev is online"
+        logger.info(f"Device is online: {device.get_id()}")
+        task.function_result = "Device is online"
         task.status = JobSchedule.STATUS_DONE
         task.write_to_db(db_controller.kv_store)
         return True
@@ -106,17 +106,17 @@ def task_runner_device(task):
         task.write_to_db(db_controller.kv_store)
         tasks_events.task_updated(task)
 
-    # resetting device
-    logger.info(f"Resetting device {device.get_id()}")
-    device_controller.reset_storage_device(device.get_id())
-    time.sleep(5)
-    device = _get_device(task)
-    if device.status == NVMeDevice.STATUS_ONLINE and device.io_error is False:
-        logger.info(f"Device is online: {device.get_id()}")
-        task.function_result = "done"
-        task.status = JobSchedule.STATUS_DONE
-        task.write_to_db(db_controller.kv_store)
-        return True
+    # # resetting device
+    # logger.info(f"Resetting device {device.get_id()}")
+    # device_controller.reset_storage_device(device.get_id())
+    # time.sleep(5)
+    # device = _get_device(task)
+    # if device.status == NVMeDevice.STATUS_ONLINE and device.io_error is False:
+    #     logger.info(f"Device is online: {device.get_id()}")
+    #     task.function_result = "done"
+    #     task.status = JobSchedule.STATUS_DONE
+    #     task.write_to_db(db_controller.kv_store)
+    #     return True
 
     logger.info(f"Restarting device {device.get_id()}")
     device_controller.restart_device(device.get_id(), force=True)
@@ -150,10 +150,9 @@ def task_runner_node(task):
         task.write_to_db(db_controller.kv_store)
         return True
 
-    # if _get_node_unavailable_devices_count(node.get_id()) == 0:
-    if node.status == StorageNode.STATUS_ONLINE:
-        logger.info(f"Node is online: {node.get_id()}, no restart needed")
-        task.function_result = "skipped because node is online"
+    if _get_node_unavailable_devices_count(node.get_id()) == 0 and node.status == StorageNode.STATUS_ONLINE:
+        logger.info(f"Node is online: {node.get_id()}")
+        task.function_result = "Node is online"
         task.status = JobSchedule.STATUS_DONE
         task.write_to_db(db_controller.kv_store)
         return True
@@ -168,7 +167,7 @@ def task_runner_node(task):
     ret = storage_node_ops.shutdown_storage_node(node.get_id(), force=True)
     if ret:
         logger.info(f"Node shutdown succeeded")
-    time.sleep(5)
+    time.sleep(3)
 
     # resetting node
     logger.info(f"Restart node {node.get_id()}")
@@ -176,9 +175,8 @@ def task_runner_node(task):
     if ret:
         logger.info(f"Node restart succeeded")
 
-    # if _get_node_unavailable_devices_count(node.get_id()) == 0:
-    if node.status == StorageNode.STATUS_ONLINE:
-        logger.info(f"Node is online: {node.get_id()}, no restart needed")
+    if _get_node_unavailable_devices_count(node.get_id()) == 0 and node.status == StorageNode.STATUS_ONLINE:
+        logger.info(f"Node is online: {node.get_id()}")
         task.function_result = "done"
         task.status = JobSchedule.STATUS_DONE
         task.write_to_db(db_controller.kv_store)
@@ -203,7 +201,8 @@ while True:
                 if task.function_name in [JobSchedule.FN_DEV_RESTART, JobSchedule.FN_NODE_RESTART]:
                     while task.status != JobSchedule.STATUS_DONE:
                         res = task_runner(task)
-                        if res is False:
+                        if res:
+                            tasks_events.task_updated(task)
+                        else:
                             time.sleep(delay_seconds)
                             delay_seconds *= 2
-                    tasks_events.task_updated(task)