sbcli-dev 4.0.19__zip → 4.0.21__zip

{sbcli_dev-4.0.19 → sbcli_dev-4.0.21}/PKG-INFO

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

{sbcli_dev-4.0.19 → sbcli_dev-4.0.21}/env_var

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

{sbcli_dev-4.0.19 → sbcli_dev-4.0.21}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.19 → sbcli_dev-4.0.21}/simplyblock_core/controllers/tasks_controller.py

@@ -193,7 +193,7 @@ def get_active_node_task(cluster_id, node_id):
     tasks = db_controller.get_job_tasks(cluster_id)
     for task in tasks:
         if task.node_id == node_id:
-            if task.status == JobSchedule.STATUS_RUNNING and task.canceled is False:
+            if task.status != JobSchedule.STATUS_DONE and task.canceled is False:
                 return task.uuid
     return False
 

{sbcli_dev-4.0.19 → sbcli_dev-4.0.21}/simplyblock_core/distr_controller.py

@@ -11,7 +11,7 @@ from simplyblock_core.kv_store import DBController
 logger = logging.getLogger()
 
 
-def send_node_status_event(node, node_status):
+def send_node_status_event(node, node_status, target_node=None):
     db_controller = DBController()
     node_id = node.get_id()
     logging.info(f"Sending event updates, node: {node_id}, status: {node_status}")
@@ -22,7 +22,10 @@ def send_node_status_event(node, node_status):
         "status": node_status}
     events = {"events": [node_status_event]}
     logger.debug(node_status_event)
-    snodes = db_controller.get_storage_nodes_by_cluster_id(node.cluster_id)
+    if target_node:
+        snodes = [target_node]
+    else:
+        snodes = db_controller.get_storage_nodes_by_cluster_id(node.cluster_id)
     for node in snodes:
         if node.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_SUSPENDED]:
             continue

{sbcli_dev-4.0.19 → sbcli_dev-4.0.21}/simplyblock_core/services/health_check_service.py

@@ -202,6 +202,18 @@ while True:
                                 if results:
                                     logger.info(utils.print_table(results))
                                     logger.info(f"Checking Distr map ... {is_passed}")
+                                    if not is_passed:
+                                        for result in results:
+                                            if result['Results'] == 'failed':
+                                                if result['Kind'] == "Device":
+                                                    dev = db_controller.get_storage_device_by_id(result['UUID'])
+                                                    distr_controller.send_dev_status_event(dev, dev.status, snode)
+                                                if result['Kind'] == "Node":
+                                                    node = db_controller.get_storage_node_by_id(result['UUID'])
+                                                    distr_controller.send_node_status_event(node, node.status, snode)
+                                        ret = rpc_client.distr_get_cluster_map(distr)
+                                        results, is_passed = distr_controller.parse_distr_cluster_map(ret)
+
                                 else:
                                     logger.error("Failed to parse distr cluster map")
 

{sbcli_dev-4.0.19 → sbcli_dev-4.0.21}/simplyblock_core/storage_node_ops.py

@@ -1910,9 +1910,8 @@ def shutdown_storage_node(node_id, force=False):
         _remove_bdev_stack(snode.lvstore_stack, rpc_client, remove_distr_only=True)
 
         if snode.jm_device:
-            # delete jm
             logger.info("Removing JM")
-            rpc_client.bdev_jm_delete(snode.jm_device.jm_bdev)
+            device_controller.remove_jm_device(snode.jm_device.get_id(), force=True)
 
     for dev in snode.nvme_devices:
         if dev.status in [NVMeDevice.STATUS_ONLINE, NVMeDevice.STATUS_READONLY]: