sbcli-dev 10.3.1__tar.gz → 10.3.3__tar.gz

{sbcli_dev-10.3.1 → sbcli_dev-10.3.3}/PKG-INFO

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

{sbcli_dev-10.3.1 → sbcli_dev-10.3.3}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.3.1 → sbcli_dev-10.3.3}/simplyblock_core/controllers/lvol_controller.py

@@ -827,6 +827,28 @@ def delete_lvol(id_or_name, force_delete=False):
 
     logger.debug(lvol)
     snode = db_controller.get_storage_node_by_id(lvol.node_id)
+
+    if not snode:
+        logger.error(f"lvol node id not found: {lvol.node_id}")
+        if not force_delete:
+            return False
+        lvol_events.lvol_delete(lvol)
+        lvol.remove(db_controller.kv_store)
+
+        # if lvol is clone and snapshot is deleted, then delete snapshot
+        if lvol.cloned_from_snap:
+            snap = db_controller.get_snapshot_by_id(lvol.cloned_from_snap)
+            if snap and snap.deleted is True:
+                lvols_count = 0
+                for lvol in db_controller.get_lvols():  # pass
+                    if lvol.cloned_from_snap == snap.get_id():
+                        lvols_count += 1
+                if lvols_count == 0:
+                    snapshot_controller.delete(snap.get_id())
+
+        logger.info("Done")
+        return True
+
     # creating RPCClient instance
     rpc_client = RPCClient(
         snode.mgmt_ip,

{sbcli_dev-10.3.1 → sbcli_dev-10.3.3}/simplyblock_core/env_var

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

{sbcli_dev-10.3.1 → sbcli_dev-10.3.3}/simplyblock_core/rpc_client.py

@@ -27,7 +27,7 @@ class RPCClient:
     # ref: https://spdk.io/doc/jsonrpc.html
     DEFAULT_ALLOWED_METHODS = ["HEAD", "GET", "PUT", "DELETE", "OPTIONS", "TRACE", "POST"]
 
-    def __init__(self, ip_address, port, username, password, timeout=60, retry=3):
+    def __init__(self, ip_address, port, username, password, timeout=180, retry=3):
         self.ip_address = ip_address
         self.port = port
         self.url = 'http://%s:%s/' % (self.ip_address, self.port)

{sbcli_dev-10.3.1 → sbcli_dev-10.3.3}/simplyblock_core/services/lvol_stat_collector.py

@@ -49,7 +49,7 @@ def add_lvol_stats(cluster, pool, lvol, stats_list, capacity_dict=None, connecte
         size_used = 0
         lvol_dict = capacity_dict[0]
         size_total = int(lvol_dict['num_blocks']*lvol_dict['block_size'])
-        cluster_size = cluster.ndcs * cluster.page_size_in_blocks
+        cluster_size = cluster.distr_ndcs * cluster.page_size_in_blocks
         if "driver_specific" in lvol_dict and "lvol" in lvol_dict["driver_specific"]:
             num_allocated_clusters = lvol_dict["driver_specific"]["lvol"]["num_allocated_clusters"]
             size_used = int(num_allocated_clusters*cluster_size)