sbcli-dev 3.8.73__zip → 3.8.75__zip

{sbcli_dev-3.8.73 → sbcli_dev-3.8.75}/PKG-INFO

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

{sbcli_dev-3.8.73 → sbcli_dev-3.8.75}/env_var

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

{sbcli_dev-3.8.73 → sbcli_dev-3.8.75}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.73 → sbcli_dev-3.8.75}/simplyblock_core/controllers/device_controller.py

@@ -782,9 +782,10 @@ def remove_jm_device(device_id, force=False):
     # if snode.jm_device.testing_bdev:
     #     ret = rpc_client.bdev_passtest_delete(snode.jm_device.testing_bdev)
 
-    if len(snode.jm_device.jm_nvme_bdev_list) == 2:
-        ret = rpc_client.bdev_raid_delete(snode.jm_device.raid_bdev)
+    # if len(snode.jm_device.jm_nvme_bdev_list) == 2:
+    ret = rpc_client.bdev_raid_delete(snode.jm_device.raid_bdev)
 
+    set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_REMOVED)
     return True
 
 

{sbcli_dev-3.8.73 → sbcli_dev-3.8.75}/simplyblock_core/rpc_client.py

@@ -26,6 +26,7 @@ class RPCException(Exception):
 class RPCClient:
 
     # ref: https://spdk.io/doc/jsonrpc.html
+    DEFAULT_ALLOWED_METHODS = ["HEAD", "GET", "PUT", "DELETE", "OPTIONS", "TRACE", "POST"]
 
     def __init__(self, ip_address, port, username, password, timeout=60, retry=3):
         self.ip_address = ip_address
@@ -37,7 +38,8 @@ class RPCClient:
         self.session = requests.session()
         self.session.auth = (self.username, self.password)
         self.session.verify = False
-        retries = Retry(total=retry, backoff_factor=1, connect=retry, read=retry)
+        retries = Retry(total=retry, backoff_factor=1, connect=retry, read=retry,
+                        allowed_methods=self.DEFAULT_ALLOWED_METHODS)
         self.session.mount("http://", HTTPAdapter(max_retries=retries))
         self.session.timeout = self.timeout
 

{sbcli_dev-3.8.73 → sbcli_dev-3.8.75}/simplyblock_core/services/health_check_service.py

@@ -6,8 +6,7 @@ from datetime import datetime
 from simplyblock_core.controllers import health_controller, storage_events, device_events
 from simplyblock_core.models.storage_node import StorageNode
 from simplyblock_core.rpc_client import RPCClient
-from simplyblock_core import constants, kv_store, utils
-
+from simplyblock_core import constants, kv_store, utils, distr_controller
 
 logger = utils.get_logger(__name__)
 
@@ -136,7 +135,48 @@ while True:
                             logger.info(f"Checking bdev: {remote_device.remote_bdev} ... not found")
                         node_remote_devices_check &= bool(ret)
 
-                health_check_status = is_node_online and node_devices_check and node_remote_devices_check
+                lvstore_check = True
+                if snode.lvstore and snode.lvstore_stack:
+                    distribs_list = []
+                    for bdev in snode.lvstore_stack:
+                        type = bdev['type']
+                        if type == "bdev_raid":
+                            distribs_list = bdev["distribs_list"]
+
+                    for distr in distribs_list:
+                        ret = rpc_client.get_bdevs(distr)
+                        if ret:
+                            logger.info(f"Checking distr bdev : {distr} ... ok")
+                            logger.info("Checking Distr map ...")
+                            ret = rpc_client.distr_get_cluster_map(distr)
+                            if not ret:
+                                logger.error("Failed to get cluster map")
+                                lvstore_check = False
+                            else:
+                                results, is_passed = distr_controller.parse_distr_cluster_map(ret)
+                                if results:
+                                    logger.info(utils.print_table(results))
+                                    logger.info(f"Checking Distr map ... {is_passed}")
+                                else:
+                                    logger.error("Failed to parse distr cluster map")
+                                lvstore_check &= is_passed
+                        else:
+                            logger.info(f"Checking distr bdev : {distr} ... not found")
+                            lvstore_check = False
+                    ret = rpc_client.get_bdevs(snode.raid)
+                    if ret:
+                        logger.info(f"Checking raid bdev: {snode.raid} ... ok")
+                    else:
+                        logger.info(f"Checking raid bdev: {snode.raid} ... not found")
+                        lvstore_check = False
+                    ret = rpc_client.bdev_lvol_get_lvstores(snode.lvstore)
+                    if ret:
+                        logger.info(f"Checking lvstore: {snode.lvstore} ... ok")
+                    else:
+                        logger.info(f"Checking lvstore: {snode.lvstore} ... not found")
+                        lvstore_check = False
+
+                health_check_status = is_node_online and node_devices_check and node_remote_devices_check and lvstore_check
             set_node_health_check(snode, health_check_status)
 
     time.sleep(constants.HEALTH_CHECK_INTERVAL_SEC)

{sbcli_dev-3.8.73 → sbcli_dev-3.8.75}/simplyblock_core/storage_node_ops.py

@@ -831,8 +831,11 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
     timeout = 60
     if spdk_image:
         timeout = 5 * 60
-    snode_api = SNodeClient(node_ip, timeout=timeout)
+    snode_api = SNodeClient(node_ip, timeout=timeout, retry=10)
     node_info, _ = snode_api.info()
+    if not node_info:
+        logger.error("SNode API is not reachable")
+        return False
     logger.info(f"Node found: {node_info['hostname']}")
     # if "cluster_id" in node_info and node_info['cluster_id']:
     #     if node_info['cluster_id'] != cluster_id:
@@ -965,8 +968,11 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
     rpc_user = "rpc_username"
     rpc_pass = "rpc_password"
     mgmt_ip = node_info['network_interface'][iface_name]['ip']
-    if enable_ha_jm:
-        spdk_image = constants.SIMPLY_BLOCK_SPDK_ULTRA_IMAGE_JM
+    if not spdk_image:
+        if enable_ha_jm:
+            spdk_image = constants.SIMPLY_BLOCK_SPDK_ULTRA_IMAGE_JM
+        else:
+            spdk_image = constants.SIMPLY_BLOCK_SPDK_ULTRA_IMAGE
 
     logger.info("Deploying SPDK")
     results = None