sbcli-dev 3.8.72__zip → 3.8.74__zip

{sbcli_dev-3.8.72 → sbcli_dev-3.8.74}/PKG-INFO

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

{sbcli_dev-3.8.72 → sbcli_dev-3.8.74}/env_var

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

{sbcli_dev-3.8.72 → sbcli_dev-3.8.74}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.72 → sbcli_dev-3.8.74}/simplyblock_core/controllers/device_controller.py

@@ -690,14 +690,21 @@ def add_device(device_id):
 
     tasks_controller.add_new_device_mig_task(device_id)
 
-    # add device to jm raid
-    if snode.jm_device.raid_bdev and snode.jm_device.jm_nvme_bdev_list < 2:
-        nvme_bdev = jm_part.nvme_bdev
-        if nvme_bdev not in snode.jm_device.jm_nvme_bdev_list:
-            ret = rpc_client.bdev_raid_add_base_bdev(snode.jm_device.raid_bdev, nvme_bdev)
-            if ret:
-                snode.jm_device.jm_nvme_bdev_list.append(nvme_bdev)
-                snode.write_to_db(db_controller.kv_store)
+    # add to jm raid
+    if snode.jm_device and snode.jm_device.raid_bdev:
+        # looking for jm partition
+        rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
+        jm_dev_part = f"{dev.nvme_bdev[:-1]}1"
+        ret = rpc_client.get_bdevs(jm_dev_part)
+        if ret:
+            logger.info(f"JM part found: {jm_dev_part}")
+            if snode.jm_device.status == JMDevice.STATUS_UNAVAILABLE:
+                restart_jm_device(snode.jm_device.get_id(), force=True)
+
+            if snode.jm_device.status == JMDevice.STATUS_ONLINE and \
+                    jm_dev_part not in snode.jm_device.jm_nvme_bdev_list:
+                remove_jm_device(snode.jm_device.get_id(), force=True)
+                restart_jm_device(snode.jm_device.get_id(), force=True)
 
     return "Done"
 

{sbcli_dev-3.8.72 → sbcli_dev-3.8.74}/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.72 → sbcli_dev-3.8.74}/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