sbcli-dev 11.0.0__tar.gz → 11.0.3__tar.gz

{sbcli_dev-11.0.0 → sbcli_dev-11.0.3}/PKG-INFO

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

{sbcli_dev-11.0.0 → sbcli_dev-11.0.3}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-11.0.0 → sbcli_dev-11.0.3}/simplyblock_core/controllers/lvol_controller.py

@@ -123,7 +123,7 @@ def validate_add_lvol_func(name, size, host_id_or_name, pool_id_or_name,
         total = pool_controller.get_pool_total_capacity(pool.get_id())
         if total + size > pool.pool_max_size:
             return False, f"Invalid LVol size: {utils.humanbytes(size)} " \
-                          f"Pool max size has reached {utils.humanbytes(total)} of {utils.humanbytes(pool.pool_max_size)}"
+                          f"Pool max size has reached {utils.humanbytes(total+size)} of {utils.humanbytes(pool.pool_max_size)}"
 
     for lvol in db_controller.get_lvols(pool.cluster_id):
         if lvol.pool_uuid == pool.get_id():
@@ -414,7 +414,7 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
     lvol.namespace = namespace or ""
     lvol.size = int(size)
     lvol.max_size = int(max_size)
-    lvol.status = LVol.STATUS_ONLINE
+    lvol.status = LVol.STATUS_IN_CREATION
 
     lvol.create_dt = str(datetime.now())
     lvol.ha_type = ha_type
@@ -485,6 +485,7 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
         lvol.crypto_key1 = crypto_key1
         lvol.crypto_key2 = crypto_key2
 
+    lvol.write_to_db(db_controller.kv_store)
 
     lvol_bdev, error = add_lvol_on_node(lvol, host_node)
     if error:
@@ -495,12 +496,25 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
 
     if ha_type == "ha":
         sec_node = db_controller.get_storage_node_by_id(host_node.secondary_node_id)
-        ret, error = add_lvol_on_node(lvol, sec_node, ha_inode_self=1)
-        if error:
-            return False, error
-        lvol.nodes.append(host_node.secondary_node_id)
+        if sec_node and sec_node.status == StorageNode.STATUS_ONLINE:
+            ret, error = add_lvol_on_node(lvol, sec_node, ha_inode_self=1)
+            if error:
+                logger.error(error)
+                logger.error(f"Failed to add lvol on node: {sec_node.get_id()}")
+                logger.info(f"Removing LVol from {host_node.get_id()}")
+                lvol.status = LVol.STATUS_IN_DELETION
+                lvol.write_to_db(db_controller.kv_store)
+                ret=delete_lvol_from_node(lvol.get_id(), host_node.get_id())
+                if ret:
+                    lvol.remove(db_controller.kv_store)
+                else:
+                    logger.error(f"Failed to remove lvol from node {host_node.get_id()}, LVol status: {lvol.status}")
+                return False, error
+
+            lvol.nodes.append(host_node.secondary_node_id)
 
     lvol.pool_uuid = pool.get_id()
+    lvol.status = LVol.STATUS_ONLINE
     lvol.write_to_db(db_controller.kv_store)
     lvol_events.lvol_create(lvol)
 
@@ -1115,10 +1129,17 @@ def resize_lvol(id, new_size):
     if lvol.max_size < new_size:
         logger.error(f"New size {new_size} must be smaller than the max size {lvol.max_size}")
         return False
-    #
-    # if lvol.cloned_from_snap:
-    #     logger.error(f"Can not resize clone!")
-    #     return False
+
+    if 0 < pool.lvol_max_size < new_size:
+        logger.error(f"Pool Max LVol size is: {utils.humanbytes(pool.lvol_max_size)}, LVol size: {utils.humanbytes(new_size)} must be below this limit")
+        return False
+
+    if pool.pool_max_size > 0:
+        total = pool_controller.get_pool_total_capacity(pool.get_id())
+        if total + new_size > pool.pool_max_size:
+            logger.error( f"Invalid LVol size: {utils.humanbytes(new_size)} " 
+                          f"Pool max size has reached {utils.humanbytes(total+new_size)} of {utils.humanbytes(pool.pool_max_size)}")
+            return False
 
     snode = db_controller.get_storage_node_by_id(lvol.node_id)
 

{sbcli_dev-11.0.0 → sbcli_dev-11.0.3}/simplyblock_core/controllers/snapshot_controller.py

@@ -58,6 +58,25 @@ def add(lvol_id, snapshot_name):
         logger.error(msg)
         return False, msg
 
+
+    rec = db_controller.get_lvol_stats(lvol, 1)
+    if rec:
+        size = rec[0].size_used
+    else:
+        size = lvol.size
+
+    if 0 < pool.lvol_max_size < size:
+        logger.error(f"Pool Max LVol size is: {utils.humanbytes(pool.lvol_max_size)}, LVol size: {utils.humanbytes(size)} must be below this limit")
+        return False
+
+    if pool.pool_max_size > 0:
+        total = pool_controller.get_pool_total_capacity(pool.get_id())
+        if total + size > pool.pool_max_size:
+            logger.error( f"Invalid LVol size: {utils.humanbytes(size)} " 
+                          f"Pool max size has reached {utils.humanbytes(total+size)} of {utils.humanbytes(pool.pool_max_size)}")
+            return False
+
+
 ##############################################################################
     # Validate adding snap on storage node
     snode_api = SNodeClient(snode.api_endpoint)
@@ -104,7 +123,7 @@ def add(lvol_id, snapshot_name):
     logger.info("Creating Snapshot bdev")
     ret = rpc_client.lvol_create_snapshot(f"{lvol.lvs_name}/{lvol.lvol_bdev}", snap_bdev_name)
     if not ret:
-        return False, "Failed to create snapshot bdev"
+        return False, f"Failed to create snapshot on node: {snode.get_id()}"
 
     size = lvol.size
     used_size = 0
@@ -124,6 +143,14 @@ def add(lvol_id, snapshot_name):
             sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=lvol.lvs_name)
             ret = sec_rpc_client.bdev_lvol_snapshot_register(
                 f"{lvol.lvs_name}/{lvol.lvol_bdev}", snap_bdev_name, snap_uuid, blobid)
+            if not ret:
+                msg = f"Failed to register snapshot on node: {sec_node.get_id()}"
+                logger.error(msg)
+                logger.info(f"Removing snapshot from {snode.get_id()}")
+                ret = rpc_client.delete_lvol(f"{lvol.lvs_name}/{snap_bdev_name}")
+                if not ret:
+                    logger.error(f"Failed to delete snap from node: {snode.get_id()}")
+                return False, msg
 
 
     snap = SnapShot()
@@ -298,6 +325,19 @@ def clone(snapshot_id, clone_name, new_size=0):
                 logger.error(msg)
                 return False, msg
 
+    size = snap.size
+    if 0 < pool.lvol_max_size < size:
+        logger.error(f"Pool Max LVol size is: {utils.humanbytes(pool.lvol_max_size)}, LVol size: {utils.humanbytes(size)} must be below this limit")
+        return False
+
+    if pool.pool_max_size > 0:
+        total = pool_controller.get_pool_total_capacity(pool.get_id())
+        if total + size > pool.pool_max_size:
+            logger.error( f"Invalid LVol size: {utils.humanbytes(size)} " 
+                          f"Pool max size has reached {utils.humanbytes(total+size)} of {utils.humanbytes(pool.pool_max_size)}")
+            return False
+
+
     # Validate cloning snap on storage node
     snode_api = SNodeClient(snode.api_endpoint)
     result, _ = snode_api.info()
@@ -404,6 +444,17 @@ def clone(snapshot_id, clone_name, new_size=0):
         if sec_node.status == StorageNode.STATUS_ONLINE:
             ret, error = lvol_controller.add_lvol_on_node(lvol, sec_node, ha_inode_self=1)
             if error:
+                logger.error(error)
+                logger.error(f"Failed to add clone on node: {sec_node.get_id()}")
+                logger.info(f"Removing clone from {snode.get_id()}")
+                lvol.status = LVol.STATUS_IN_DELETION
+                lvol.write_to_db(db_controller.kv_store)
+                ret = lvol_controller.delete_lvol_from_node(lvol.get_id(), snode.get_id())
+                if ret:
+                    lvol.remove(db_controller.kv_store)
+                else:
+                    logger.error(f"Failed to remove clone from node {snode.get_id()}, LVol status: {lvol.status}")
+
                 return False, error
 
         lvol.nodes.append(snode.secondary_node_id)

{sbcli_dev-11.0.0 → sbcli_dev-11.0.3}/simplyblock_core/env_var

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

{sbcli_dev-11.0.0 → sbcli_dev-11.0.3}/simplyblock_core/models/lvol_model.py

@@ -8,6 +8,7 @@ from simplyblock_core.models.nvme_device import NVMeDevice
 
 class LVol(BaseModel):
 
+    STATUS_IN_CREATION = 'in_creation'
     STATUS_ONLINE = 'online'
     STATUS_OFFLINE = 'offline'
     STATUS_IN_DELETION = 'in_deletion'
@@ -16,6 +17,7 @@ class LVol(BaseModel):
         STATUS_ONLINE: 1,
         STATUS_OFFLINE: 2,
         STATUS_IN_DELETION: 3,
+        STATUS_IN_CREATION: 4,
     }
 
     base_bdev: str = ""