sbcli-dev 10.8.2__tar.gz → 10.8.4__tar.gz

{sbcli_dev-10.8.2 → sbcli_dev-10.8.4}/PKG-INFO

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

{sbcli_dev-10.8.2 → sbcli_dev-10.8.4}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.8.2 → sbcli_dev-10.8.4}/simplyblock_core/controllers/snapshot_controller.py

@@ -102,10 +102,15 @@ def add(lvol_id, snapshot_name):
         return False, "Failed to create snapshot bdev"
 
     size = lvol.size
+    used_size = 0
     snap_bdev = rpc_client.get_bdevs(f"{lvol.lvs_name}/{snap_bdev_name}")
     if snap_bdev:
         snap_uuid = snap_bdev[0]['uuid']
         blobid = snap_bdev[0]['driver_specific']['lvol']['blobid']
+        cluster = db_controller.get_cluster_by_id(pool.cluster_id)
+        cluster_size = cluster.distr_ndcs * cluster.page_size_in_blocks
+        num_allocated_clusters = snap_bdev[0]["driver_specific"]["lvol"]["num_allocated_clusters"]
+        used_size = int(num_allocated_clusters*cluster_size)
 
     if snode.secondary_node_id and blobid:
         sec_node = db_controller.get_storage_node_by_id(snode.secondary_node_id)
@@ -120,6 +125,7 @@ def add(lvol_id, snapshot_name):
     snap.uuid = str(uuid.uuid4())
     snap.snap_uuid = snap_uuid
     snap.size = size
+    snap.used_size = used_size
     snap.blobid = blobid
     snap.pool_uuid = pool.get_id()
     snap.cluster_id = pool.cluster_id
@@ -156,7 +162,8 @@ def list(all=False):
         data.append({
             "UUID": snap.uuid,
             "Name": snap.snap_name,
-            "Size": utils.humanbytes(snap.size),
+            "Size": utils.humanbytes(snap.used_size),
+            "ProvSize": utils.humanbytes(snap.size),
             "BDev": snap.snap_bdev,
             "LVol ID": snap.lvol.get_id(),
             "Created At": time.strftime("%H:%M:%S, %d/%m/%Y", time.gmtime(snap.created_at)),
@@ -181,7 +188,7 @@ def delete(snapshot_uuid, force_delete=False):
         if lvol.cloned_from_snap and lvol.cloned_from_snap == snapshot_uuid:
             clones.append(lvol)
 
-    if len(clones) >= 1:
+    if len(clones) > 1:
         logger.warning(f"Soft delete snapshot with clones")
         snap = db_controller.get_snapshot_by_id(snapshot_uuid)
         snap.deleted = True

{sbcli_dev-10.8.2 → sbcli_dev-10.8.4}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=10.8.2
+SIMPLY_BLOCK_VERSION=10.8.4
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main
 DOCKER_USER=hamdysimplyblock

{sbcli_dev-10.8.2 → sbcli_dev-10.8.4}/simplyblock_core/models/snapshot.py

@@ -16,6 +16,7 @@ class SnapShot(BaseModel):
     pool_uuid: str = ""
     ref_count: int = 0
     size: int = 0
+    used_size: int = 0
     snap_bdev: str = ""
     snap_name: str = ""
     snap_ref_id: str = ""

{sbcli_dev-10.8.2 → sbcli_dev-10.8.4}/simplyblock_core/storage_node_ops.py

@@ -3028,7 +3028,7 @@ def create_lvstore(snode, ndcs, npcs, distr_bs, distr_chunk_bs, page_size_in_blo
                 "name": lvs_name,
                 "bdev_name": raid_device,
                 "cluster_sz": cluster_sz,
-                "clear_method": "unmap",
+                "clear_method": "none",
                 "num_md_pages_per_cluster_ratio": 1,
             }
         }