sbcli-pre 25.3rc2__tar.gz → 25.3.2__tar.gz

{sbcli-pre-25.3rc2 → sbcli-pre-25.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-pre
-Version: 25.3rc2
+Version: 25.3.2
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
@@ -24,7 +24,7 @@ aws codeartifact login --tool pip --repository sbcli --domain simplyblock --doma
 ```
 Install package
 ```bash
-pip install --extra-index-url https://pypi.org/simple sbcli-dev
+pip install --extra-index-url https://pypi.org/simple sbcli
 ```
 
 # Components

{sbcli-pre-25.3rc2 → sbcli-pre-25.3.2}/README.md

@@ -13,7 +13,7 @@ aws codeartifact login --tool pip --repository sbcli --domain simplyblock --doma
 ```
 Install package
 ```bash
-pip install --extra-index-url https://pypi.org/simple sbcli-dev
+pip install --extra-index-url https://pypi.org/simple sbcli
 ```
 
 # Components

{sbcli-pre-25.3rc2 → sbcli-pre-25.3.2}/sbcli_pre.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sbcli-pre
-Version: 25.3rc2
+Version: 25.3.2
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
@@ -24,7 +24,7 @@ aws codeartifact login --tool pip --repository sbcli --domain simplyblock --doma
 ```
 Install package
 ```bash
-pip install --extra-index-url https://pypi.org/simple sbcli-dev
+pip install --extra-index-url https://pypi.org/simple sbcli
 ```
 
 # Components

{sbcli-pre-25.3rc2 → sbcli-pre-25.3.2}/simplyblock_core/constants.py

@@ -121,13 +121,13 @@ SPDK_PROXY_TIMEOUT=60*5
 LVOL_NVME_CONNECT_RECONNECT_DELAY=2
 LVOL_NVME_CONNECT_CTRL_LOSS_TMO=-1
 LVOL_NVME_CONNECT_NR_IO_QUEUES=6
-LVOL_NVME_CONNECT_TIMEOUT_S=10
-LVOL_NVME_KEEP_ALIVE_TO=3
+LVOL_NVME_CONNECT_TIMEOUT_S=12
+LVOL_NVME_KEEP_ALIVE_TO=12
 LVOL_NVMF_PORT_START=9100
 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.3rc2 → sbcli-pre-25.3.2}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=25.3pre2
+SIMPLY_BLOCK_VERSION=25.3.2
 
-SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main
-SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=public.ecr.aws/simply-block/ultra:main-latest
+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.3rc2 → sbcli-pre-25.3.2}/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.3rc2 → sbcli-pre-25.3.2}/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):