sbcli-pre 25.3.6__tar.gz → 25.3.8__tar.gz

{sbcli-pre-25.3.6 → sbcli-pre-25.3.8}/PKG-INFO

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

{sbcli-pre-25.3.6 → sbcli-pre-25.3.8}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli-pre-25.3.6 → sbcli-pre-25.3.8}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=25.3.6
+SIMPLY_BLOCK_VERSION=25.3.8
 
 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.6 → sbcli-pre-25.3.8}/simplyblock_core/services/lvol_monitor.py

@@ -83,17 +83,18 @@ while True:
                             sec_node.mgmt_ip, sec_node.rpc_port,
                             sec_node.rpc_username, sec_node.rpc_password, timeout=3, retry=2)
                         ret = sec_rpc_client.get_bdevs()
-                        for bdev in ret:
-                            sec_node_bdev_names[bdev['name']] = bdev
+                        if ret:
+                            for bdev in ret:
+                                sec_node_bdev_names[bdev['name']] = bdev
 
                         ret = sec_rpc_client.subsystem_list()
-                        for sub in ret:
-                            sec_node_lvols_nqns[sub['nqn']] = sub
+                        if ret:
+                            for sub in ret:
+                                sec_node_lvols_nqns[sub['nqn']] = sub
 
                 for lvol in db_controller.get_lvols_by_node_id(snode.get_id()):
 
-                    if lvol.io_error:
-                        logger.debug(f"Skipping LVol health check because of io_error {lvol.get_id()}")
+                    if lvol.status == LVol.STATUS_IN_CREATION:
                         continue
 
                     if lvol.status == lvol.STATUS_IN_DELETION:
@@ -116,12 +117,10 @@ while True:
                         continue
 
                     passed = True
-
-                    if lvol.ha_type == 'single':
-                        ret = health_controller.check_lvol_on_node(
-                            lvol.get_id(), lvol.node_id, node_bdev_names, node_lvols_nqns)
-                        if not ret:
-                            passed = False
+                    ret = health_controller.check_lvol_on_node(
+                        lvol.get_id(), lvol.node_id, node_bdev_names, node_lvols_nqns)
+                    if not ret:
+                        passed = False
 
 
                     if lvol.ha_type == "ha":
@@ -132,19 +131,20 @@ while True:
                             if not ret:
                                 passed = False
 
+                    if snode.lvstore_status == "ready":
 
-                    logger.info(f"LVol: {lvol.get_id()}, is healthy: {passed}")
-                    set_lvol_health_check(lvol, passed)
-                    if passed:
-                        set_lvol_status(lvol, LVol.STATUS_ONLINE)
+                        logger.info(f"LVol: {lvol.get_id()}, is healthy: {passed}")
+                        set_lvol_health_check(lvol, passed)
+                        if passed:
+                            set_lvol_status(lvol, LVol.STATUS_ONLINE)
 
-                for snap in db_controller.get_snapshots_by_node_id(snode.get_id()):
-                    if snap.snap_bdev in node_bdev_names:
-                        logger.info(f"Checking bdev: {snap.snap_bdev} ... ok")
-                        set_snapshot_health_check(snap, True)
-                    else:
-                        logger.error(f"Checking bdev: {snap.snap_bdev} ... failed")
-                        set_snapshot_health_check(snap, False)
-                        passed = False
+                        for snap in db_controller.get_snapshots_by_node_id(snode.get_id()):
+                            if snap.snap_bdev in node_bdev_names:
+                                logger.info(f"Checking bdev: {snap.snap_bdev} ... ok")
+                                set_snapshot_health_check(snap, True)
+                            else:
+                                logger.error(f"Checking bdev: {snap.snap_bdev} ... failed")
+                                set_snapshot_health_check(snap, False)
+                                passed = False
 
     time.sleep(constants.LVOL_MONITOR_INTERVAL_SEC)

{sbcli-pre-25.3.6 → sbcli-pre-25.3.8}/simplyblock_core/storage_node_ops.py

@@ -2636,8 +2636,8 @@ def deploy(ifname, spdk_cpu_mask="", isolate_cores=False):
     return f"{dev_ip}:5000"
 
 def start_storage_node_api_container(node_ip):
-    # node_docker = docker.DockerClient(base_url=f"tcp://{node_ip}:2375", version="auto", timeout=60 * 5)
-    node_docker = docker.DockerClient(base_url='unix://var/run/docker.sock', version="auto", timeout=60 * 5)
+    node_docker = docker.DockerClient(base_url=f"tcp://{node_ip}:2375", version="auto", timeout=60 * 5)
+    # node_docker = docker.DockerClient(base_url='unix://var/run/docker.sock', version="auto", timeout=60 * 5)
 
     logger.info(f"Pulling image {constants.SIMPLY_BLOCK_DOCKER_IMAGE}")
     node_docker.images.pull(constants.SIMPLY_BLOCK_DOCKER_IMAGE)

{sbcli-pre-25.3.6 → sbcli-pre-25.3.8}/simplyblock_core/utils.py

@@ -663,6 +663,13 @@ def parse_size(size_string: str, mode: str = 'si/iec', unit: str = '', strict: b
     'jedec' for binary only units. If `strict`, parsing will be case-sensitive and
     expect the 'B' suffix.
     """
+    if not unit:
+        try:
+            x = int(size_string)
+            return x
+        except Exception:
+            pass
+
     try:
         m = re.match(r'^(?P<size_in_unit>\d+) ?(?P<unit>\w+)?$', size_string.strip())
         if m is None:

{sbcli-pre-25.3.6 → sbcli-pre-25.3.8}/simplyblock_web/blueprints/web_api_snapshot.py

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 import logging
+import time
 
 from flask import Blueprint
 from flask import request
@@ -45,7 +46,9 @@ def list_snapshots():
     for snap in snaps:
         if snap.cluster_id != cluster_id:
             continue
-        data.append(snap.get_clean_dict())
+        d = snap.get_clean_dict()
+        d["created_at"] = str(snap.created_at)
+        data.append(d)
     return utils.get_response(data)