sbcli-dev 4.0.18__zip → 4.0.20__zip

{sbcli_dev-4.0.18 → sbcli_dev-4.0.20}/PKG-INFO

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

{sbcli_dev-4.0.18 → sbcli_dev-4.0.20}/env_var

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

{sbcli_dev-4.0.18 → sbcli_dev-4.0.20}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.18 → sbcli_dev-4.0.20}/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.18 → sbcli_dev-4.0.20}/simplyblock_core/rpc_client.py

@@ -490,22 +490,6 @@ class RPCClient:
         }
         return self._request("bdev_nvme_attach_controller", params)
 
-    def bdev_nvme_attach_controller_tcp_jm(self, name, nqn, ip, port):
-        params = {
-            "name": name,
-            "trtype": "tcp",
-            "traddr": ip,
-            "adrfam": "ipv4",
-            "trsvcid": str(port),
-            "subnqn": nqn,
-            "fast_io_fail_timeout_sec": 1,
-            "ctrlr_loss_timeout_sec": 1,
-            "reconnect_delay_sec": 1,
-            "fabrics_connect_timeout_us": 100000,
-            "multipath":"disable"
-        }
-        return self._request("bdev_nvme_attach_controller", params)
-
     def bdev_nvme_attach_controller_tcp_caching(self, name, nqn, ip, port):
         params = {
             "name": name,

{sbcli_dev-4.0.18 → sbcli_dev-4.0.20}/simplyblock_core/services/health_check_service.py

@@ -129,7 +129,7 @@ while True:
                         node_remote_devices_check &= bool(ret)
 
                 for node in db_controller.get_storage_nodes_by_cluster_id(snode.cluster_id):
-                    if node.status != StorageNode.STATUS_ONLINE:
+                    if node.status != StorageNode.STATUS_ONLINE or node.get_id() == snode.get_id():
                         continue
                     for dev in node.nvme_devices:
                         if dev.status == StorageNode.STATUS_ONLINE:
@@ -202,8 +202,21 @@ 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")
+
                                 lvstore_check &= is_passed
                         else:
                             logger.info(f"Checking distr bdev : {distr} ... not found")

{sbcli_dev-4.0.18 → sbcli_dev-4.0.20}/simplyblock_core/services/main_distr_event_collector.py

@@ -48,8 +48,9 @@ def process_device_event(event):
         device_id = device.get_id()
         node = db_controller.get_storage_node_by_id(node_id)
         if device.node_id != node_id:
-            logger.info(f"Setting storage id: {storage_id} unavailable")
-            distr_controller.send_dev_status_event(device, NVMeDevice.STATUS_UNAVAILABLE, node)
+            if event.message != 'SPDK_BDEV_EVENT_REMOVE':
+                logger.info(f"Setting storage id: {storage_id} unavailable")
+                distr_controller.send_dev_status_event(device, NVMeDevice.STATUS_UNAVAILABLE, node)
             # if device.status == NVMeDevice.STATUS_ONLINE:
             #     device_controller.device_set_io_error(device_id, True)
             #     device_controller.device_set_unavailable(device_id)

{sbcli_dev-4.0.18 → sbcli_dev-4.0.20}/simplyblock_core/storage_node_ops.py

@@ -2032,6 +2032,7 @@ def resume_storage_node(node_id):
         device_controller.set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_ONLINE)
 
     logger.info("Connecting to remote devices")
+    snode = db_controller.get_storage_node_by_id(node_id)
     snode.remote_devices = _connect_to_remote_devs(snode)
     snode.write_to_db(db_controller.kv_store)