sbcli-pre 25.3.14__tar.gz → 25.3.16__tar.gz

{sbcli-pre-25.3.14 → sbcli-pre-25.3.16}/PKG-INFO

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

{sbcli-pre-25.3.14 → sbcli-pre-25.3.16}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli-pre-25.3.14 → sbcli-pre-25.3.16}/simplyblock_core/cluster_ops.py

@@ -640,6 +640,27 @@ def cluster_activate(cl_id, force=False, force_lvstore_create=False):
                 set_cluster_status(cl_id, ols_status)
                 return False
 
+    for snode in snodes:
+        if not snode.is_secondary_node:
+            continue
+        if snode.status != StorageNode.STATUS_ONLINE:
+            continue
+
+        logger.info(f"Activating sec node: {snode.get_id()}")
+        ret = storage_node_ops.recreate_lvstore_on_sec(snode)
+        snode = db_controller.get_storage_node_by_id(snode.get_id())
+        if ret:
+            snode.lvstore_status = "ready"
+            snode.write_to_db()
+
+        else:
+            snode.lvstore_status = "failed"
+            snode.write_to_db()
+            logger.error(f"Failed to activate node {snode.get_id()}")
+            if not force:
+                logger.error("Failed to activate cluster")
+                # set_cluster_status(cl_id, ols_status)
+                # return False
 
     if not cluster.cluster_max_size:
         cluster = db_controller.get_cluster_by_id(cl_id)
@@ -1234,12 +1255,13 @@ def update_cluster(cluster_id, mgmt_only=False, restart=False, spdk_image=None,
         logger.info(f"Pulling image {constants.SIMPLY_BLOCK_DOCKER_IMAGE}")
         cluster_docker.images.pull(constants.SIMPLY_BLOCK_DOCKER_IMAGE)
         image_without_tag = constants.SIMPLY_BLOCK_DOCKER_IMAGE.split(":")[0]
-        image_without_tag = image_without_tag.split("/")[-1]
+        image_without_tag = image_without_tag.split("/")
+        image_parts = "/".join(image_without_tag[-2:])
         service_image = constants.SIMPLY_BLOCK_DOCKER_IMAGE
         if mgmt_image:
             service_image = mgmt_image
         for service in cluster_docker.services.list():
-            if image_without_tag in service.attrs['Spec']['Labels']['com.docker.stack.image']:
+            if image_parts in service.attrs['Spec']['Labels']['com.docker.stack.image']:
                 logger.info(f"Updating service {service.name}")
                 service.update(image=service_image, force_update=True)
         logger.info("Done updating mgmt cluster")

{sbcli-pre-25.3.14 → sbcli-pre-25.3.16}/simplyblock_core/controllers/snapshot_controller.py

@@ -84,7 +84,8 @@ def add(lvol_id, snapshot_name):
     if cluster.status not in [cluster.STATUS_ACTIVE, cluster.STATUS_DEGRADED]:
         return False, f"Cluster is not active, status: {cluster.status}"
 
-    snap_bdev_name = f"SNAP_{utils.get_random_vuid()}"
+    snap_vuid = utils.get_random_snapshot_vuid()
+    snap_bdev_name = f"SNAP_{snap_vuid}"
     size = lvol.size
     blobid = 0
     snap_uuid = ""
@@ -189,6 +190,7 @@ def add(lvol_id, snapshot_name):
     snap.snap_bdev = f"{lvol.lvs_name}/{snap_bdev_name}"
     snap.created_at = int(time.time())
     snap.lvol = lvol
+    snap.vuid = snap_vuid
 
     snap.write_to_db(db_controller.kv_store)
 

{sbcli-pre-25.3.14 → sbcli-pre-25.3.16}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=25.3.14
+SIMPLY_BLOCK_VERSION=25.3.16
 
 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.14 → sbcli-pre-25.3.16}/simplyblock_core/models/snapshot.py

@@ -21,3 +21,4 @@ class SnapShot(BaseModel):
     snap_name: str = ""
     snap_ref_id: str = ""
     snap_uuid: str = ""
+    vuid: int = 0

{sbcli-pre-25.3.14 → sbcli-pre-25.3.16}/simplyblock_core/scripts/dashboards/cluster.json

@@ -1313,7 +1313,7 @@
                             }
                         ]
                     },
-                    "unit": "bytes"
+                    "unit": "binBps"
                 },
                 "overrides": []
             },

{sbcli-pre-25.3.14 → sbcli-pre-25.3.16}/simplyblock_core/scripts/dashboards/devices.json

@@ -753,7 +753,7 @@
                             }
                         ]
                     },
-                    "unit": "bytes"
+                    "unit": "binBps"
                 },
                 "overrides": []
             },
@@ -1322,7 +1322,7 @@
                             }
                         ]
                     },
-                    "unit": "bytes"
+                    "unit": "binBps"
                 },
                 "overrides": []
             },

{sbcli-pre-25.3.14 → sbcli-pre-25.3.16}/simplyblock_core/scripts/prometheus.yml

@@ -1,5 +1,5 @@
 global:
-  scrape_interval: 15s
+  scrape_interval: 30s
   external_labels:
     monitor: 'codelab-monitor'
 

{sbcli-pre-25.3.14 → sbcli-pre-25.3.16}/simplyblock_core/utils.py

@@ -629,7 +629,7 @@ def get_logger(name=""):
 def _parse_unit(unit: str, mode: str = 'si/iec', strict: bool = True) -> tuple[int, int]:
     """Parse the given unit, returning the associated base and exponent
 
-    Mode can be either 'si/iec' to parse decimal (SI) and binary (IEC) units, or 
+    Mode can be either 'si/iec' to parse decimal (SI) and binary (IEC) units, or
     'jedec' for binary only units. If `strict`, parsing will be case-sensitive and
     expect the 'B' suffix.
     """
@@ -659,7 +659,7 @@ def parse_size(size_string: str, mode: str = 'si/iec', unit: str = '', strict: b
     """Parse the given data size
 
     If passed and not explicitly given, 'unit' will be assumed.
-    Mode can be either 'si/iec' to parse decimal (SI) and binary (IEC) units, or 
+    Mode can be either 'si/iec' to parse decimal (SI) and binary (IEC) units, or
     'jedec' for binary only units. If `strict`, parsing will be case-sensitive and
     expect the 'B' suffix.
     """
@@ -910,3 +910,16 @@ def store_cores_config(spdk_cpu_mask):
         logger.info(f"JSON file successfully written to {file_path}")
     except subprocess.CalledProcessError as e:
         logger.error(f"Error writing to file: {e}")
+
+
+def get_random_snapshot_vuid():
+    from simplyblock_core.db_controller import DBController
+    db_controller = DBController()
+    used_vuids = []
+    for snap in db_controller.get_snapshots():
+        used_vuids.append(snap.vuid)
+
+    r = 1 + int(random.random() * 1000000)
+    while r in used_vuids:
+        r = 1 + int(random.random() * 1000000)
+    return r