sbcli-pre 25.3.1__tar.gz → 25.3.3__tar.gz

{sbcli-pre-25.3.1 → sbcli-pre-25.3.3}/PKG-INFO

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

{sbcli-pre-25.3.1 → sbcli-pre-25.3.3}/requirements.txt

@@ -1,4 +1,4 @@
-foundationdb
+foundationdb==7.3.3
 requests
 numpy
 prettytable>=3.10.0

{sbcli-pre-25.3.1 → sbcli-pre-25.3.3}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli-pre-25.3.1 → sbcli-pre-25.3.3}/sbcli_pre.egg-info/requires.txt

@@ -1,4 +1,4 @@
-foundationdb
+foundationdb==7.3.3
 requests
 numpy
 prettytable>=3.10.0

{sbcli-pre-25.3.1 → sbcli-pre-25.3.3}/simplyblock_core/constants.py

@@ -128,6 +128,6 @@ QPAIR_COUNT=32
 NVME_TIMEOUT_US=20000000
 
 NVMF_MAX_SUBSYSTEMS=50000
-HA_JM_COUNT=2
+HA_JM_COUNT=3
 
 TEMP_CORES_FILE = "/etc/simplyblock/tmp_cores_config"

{sbcli-pre-25.3.1 → sbcli-pre-25.3.3}/simplyblock_core/controllers/lvol_controller.py

@@ -659,7 +659,7 @@ def add_lvol_on_node(lvol, snode, is_primary=True):
     else:
         min_cntlid =  1000
     logger.info("creating subsystem %s", lvol.nqn)
-    ret = rpc_client.subsystem_create(lvol.nqn, 'sbcli-cn', lvol.uuid, min_cntlid)
+    ret = rpc_client.subsystem_create(lvol.nqn, lvol.ha_type, lvol.uuid, min_cntlid)
     logger.debug(ret)
 
     # add listeners
@@ -690,10 +690,11 @@ def add_lvol_on_node(lvol, snode, is_primary=True):
     logger.debug(spdk_mem_info_after)
 
     ret = rpc_client.get_bdevs(f"{lvol.lvs_name}/{lvol.lvol_bdev}")
-    lvol_bdev = ret[0]
-
-    return lvol_bdev, None
-
+    if ret:
+        lvol_bdev = ret[0]
+        return lvol_bdev, None
+    else:
+        return False, "Failed to get lvol bdev"
 
 def is_node_leader(snode, lvs_name):
     rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
@@ -718,7 +719,7 @@ def recreate_lvol_on_node(lvol, snode, ha_inode_self=0, ana_state=None):
 
     min_cntlid = 1 + 1000 * ha_inode_self
     logger.info("creating subsystem %s", lvol.nqn)
-    rpc_client.subsystem_create(lvol.nqn, 'sbcli-cn', lvol.uuid, min_cntlid)
+    rpc_client.subsystem_create(lvol.nqn, lvol.ha_type, lvol.uuid, min_cntlid)
 
     # if namespace_found is False:
     logger.info("Add BDev to subsystem")

{sbcli-pre-25.3.1 → sbcli-pre-25.3.3}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=25.3.1
+SIMPLY_BLOCK_VERSION=25.3.3
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:R25.3-PRE-Hotfix
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=public.ecr.aws/simply-block/ultra:R25.3-PRE-latest

{sbcli-pre-25.3.1 → sbcli-pre-25.3.3}/simplyblock_core/scripts/clean_local_storage_deploy.sh

@@ -6,9 +6,9 @@ sudo docker rm SNodeAPI --force
 sudo docker rm CachingNodeAPI --force
 sudo docker stack rm app
 sudo docker swarm leave --force
+sleep 2
+sudo service docker restart
 sudo docker container prune -f
-#sudo docker image prune -a -f
 sudo docker volume prune -a -f
-sudo service docker restart
-echo "Done"
 sudo rm -rf /etc/foundationdb/data/
+echo "Done"

{sbcli-pre-25.3.1 → sbcli-pre-25.3.3}/simplyblock_core/services/spdk_http_proxy_server.py

@@ -50,7 +50,7 @@ def rpc_call(req):
     response = None
 
     while not closed:
-        newdata = sock.recv(1024)
+        newdata = sock.recv(1024*1024*1024)
         if newdata == b'':
             closed = True
         buf += newdata.decode('ascii')

{sbcli-pre-25.3.1 → sbcli-pre-25.3.3}/simplyblock_core/storage_node_ops.py

@@ -1922,8 +1922,8 @@ def restart_storage_node(
     snode.lvstore_status = ""
     snode.write_to_db(db_controller.kv_store)
 
-    logger.info("Setting node status to Online")
-    set_node_status(node_id, StorageNode.STATUS_ONLINE, reconnect_on_online=False)
+    # logger.info("Setting node status to Online")
+    # set_node_status(node_id, StorageNode.STATUS_ONLINE, reconnect_on_online=False)
 
     # time.sleep(1)
     snode = db_controller.get_storage_node_by_id(snode.get_id())
@@ -1960,18 +1960,23 @@ def restart_storage_node(
             logger.error("Failed to recreate lvstore")
             snode.lvstore_status = "failed"
             snode.write_to_db()
+            return False
         else:
             snode.lvstore_status = "ready"
             snode.write_to_db()
 
-    if cluster.status in [Cluster.STATUS_ACTIVE, Cluster.STATUS_DEGRADED, Cluster.STATUS_READONLY]:
-        for dev in snode.nvme_devices:
-            if dev.status == NVMeDevice.STATUS_ONLINE:
-                logger.info(f"Starting migration task for device {dev.get_id()}")
-                tasks_controller.add_device_mig_task(dev.get_id())
+            logger.info("Setting node status to Online")
+            set_node_status(node_id, StorageNode.STATUS_ONLINE, reconnect_on_online=False)
+
+            if cluster.status in [Cluster.STATUS_ACTIVE, Cluster.STATUS_DEGRADED, Cluster.STATUS_READONLY]:
+                for dev in snode.nvme_devices:
+                    if dev.status == NVMeDevice.STATUS_ONLINE:
+                        logger.info(f"Starting migration task for device {dev.get_id()}")
+                        tasks_controller.add_device_mig_task(dev.get_id())
+            return True
 
     logger.info("Done")
-    return "Success"
+    return True
 
 
 def list_storage_nodes(is_json, cluster_id=None):