sbcli-dev 17.2.0__tar.gz → 17.2.2__tar.gz

{sbcli_dev-17.2.0 → sbcli_dev-17.2.2}/PKG-INFO

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

{sbcli_dev-17.2.0 → sbcli_dev-17.2.2}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-17.2.0 → sbcli_dev-17.2.2}/simplyblock_cli/clibase.py

@@ -426,7 +426,8 @@ class CLIWrapperBase:
     def volume__resize(self, sub_command, args):
         volume_id = args.volume_id
         size = utils.parse_size(args.size)
-        return lvol_controller.resize_lvol(volume_id, size)
+        ret, err =  lvol_controller.resize_lvol(volume_id, size)
+        return ret
 
     def volume__create_snapshot(self, sub_command, args):
         volume_id = args.volume_id

{sbcli_dev-17.2.0 → sbcli_dev-17.2.2}/simplyblock_core/constants.py

@@ -35,7 +35,7 @@ PROT_STAT_COLLECTOR_INTERVAL_SEC = 2
 SPDK_STAT_COLLECTOR_INTERVAL_SEC = 5
 DISTR_EVENT_COLLECTOR_INTERVAL_SEC = 2
 DISTR_EVENT_COLLECTOR_NUM_OF_EVENTS = 10
-CAP_MONITOR_INTERVAL_SEC = 30
+CAP_MONITOR_INTERVAL_SEC = 10
 SSD_VENDOR_WHITE_LIST = ["1d0f:cd01", "1d0f:cd00"]
 CACHED_LVOL_STAT_COLLECTOR_INTERVAL_SEC = 5
 DEV_DISCOVERY_INTERVAL_SEC = 60

{sbcli_dev-17.2.0 → sbcli_dev-17.2.2}/simplyblock_core/controllers/lvol_controller.py

@@ -588,6 +588,7 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
                     return False, error
 
     lvol.pool_uuid = pool.get_id()
+    lvol.pool_name = pool.pool_name
     lvol.status = LVol.STATUS_ONLINE
     lvol.write_to_db(db_controller.kv_store)
     lvol_events.lvol_create(lvol)
@@ -1060,10 +1061,16 @@ def list_lvols(is_json, cluster_id, pool_id_or_name, all=False):
         logger.debug(lvol)
         if lvol.deleted is True and all is False:
             continue
+        size_used = 0
+        records = db_controller.get_lvol_stats(lvol, 1)
+        if records:
+            size_used = records[0].size_used
+
         data.append({
             "Id": lvol.uuid,
             "Name": lvol.lvol_name,
             "Size": utils.humanbytes(lvol.size),
+            "Used": f"{utils.humanbytes(size_used)}",
             "Hostname": lvol.hostname,
             "HA": lvol.ha_type,
             "BlobID": lvol.blobid or "",
@@ -1171,32 +1178,38 @@ def resize_lvol(id, new_size):
     db_controller = DBController()
     lvol = db_controller.get_lvol_by_id(id)
     if not lvol:
-        logger.error(f"LVol not found: {id}")
-        return False
+        msg = f"LVol not found: {id}"
+        logger.error(msg)
+        return False, msg
 
     pool = db_controller.get_pool_by_id(lvol.pool_uuid)
     if pool.status == Pool.STATUS_INACTIVE:
-        logger.error(f"Pool is disabled")
-        return False
+        msg = f"Pool is disabled {pool.get_id()}"
+        logger.error(msg)
+        return False, msg
 
     if lvol.size >= new_size:
-        logger.error(f"New size {new_size} must be higher than the original size {lvol.size}")
-        return False
+        msg = f"New size {new_size} must be higher than the original size {lvol.size}"
+        logger.error(msg)
+        return False, msg
 
     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
+        msg = f"New size {new_size} must be smaller than the max size {lvol.max_size}"
+        logger.error(msg)
+        return False, msg
 
     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
+        msg = f"Pool Max LVol size is: {utils.humanbytes(pool.lvol_max_size)}, "\
+              "LVol size: {utils.humanbytes(new_size)} must be below this limit"
+        logger.error(msg)
+        return False, msg
 
     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
+            msg =f"Invalid LVol size: {utils.humanbytes(new_size)}, Pool max size has reached {utils.humanbytes(total+new_size)} of {utils.humanbytes(pool.pool_max_size)}"
+            logger.error(msg)
+            return False, msg
 
     snode = db_controller.get_storage_node_by_id(lvol.node_id)
 
@@ -1208,13 +1221,13 @@ def resize_lvol(id, new_size):
     rpc_client = RPCClient(
         snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
 
-    error = False
     if lvol.ha_type == "single":
 
         ret = rpc_client.bdev_lvol_resize(f"{lvol.lvs_name}/{lvol.lvol_bdev}", size_in_mib)
         if not ret:
-            logger.error(f"Error resizing lvol on node: {snode.get_id()}")
-            error = True
+            msg = f"Error resizing lvol on node: {snode.get_id()}"
+            logger.error(msg)
+            return False, msg
 
     else:
         primary_node = None
@@ -1228,7 +1241,7 @@ def resize_lvol(id, new_size):
                 if sec_node.status == StorageNode.STATUS_DOWN:
                     msg = f"Secondary node is in down status, can not resize lvol"
                     logger.error(msg)
-                    error = True
+                    return False, msg
 
                 elif sec_node.status == StorageNode.STATUS_ONLINE:
                     secondary_node = sec_node
@@ -1258,10 +1271,8 @@ def resize_lvol(id, new_size):
             # both primary and secondary are not online
             msg = f"Host nodes are not online"
             logger.error(msg)
-            error = True
+            return False, msg
 
-        if error:
-            return False
 
         if primary_node:
             logger.info(f"Resizing LVol: {lvol.get_id()} on node: {primary_node.get_id()}")
@@ -1271,8 +1282,9 @@ def resize_lvol(id, new_size):
 
             ret = rpc_client.bdev_lvol_resize(f"{lvol.lvs_name}/{lvol.lvol_bdev}", size_in_mib)
             if not ret:
-                logger.error(f"Error resizing lvol on node: {primary_node.get_id()}")
-                error = True
+                msg = f"Error resizing lvol on node: {primary_node.get_id()}"
+                logger.error(msg)
+                return False, msg
 
         if secondary_node:
             logger.info(f"Resizing LVol: {lvol.get_id()} on node: {secondary_node.get_id()}")
@@ -1284,18 +1296,17 @@ def resize_lvol(id, new_size):
 
                 ret = sec_rpc_client.bdev_lvol_resize(f"{lvol.lvs_name}/{lvol.lvol_bdev}", size_in_mib)
                 if not ret:
-                    logger.error(f"Error resizing lvol on node: {sec_node.get_id()}")
-                    error = True
+                    msg = f"Error resizing lvol on node: {sec_node.get_id()}"
+                    logger.error(msg)
+                    return False, msg
 
+    lvol = db_controller.get_lvol_by_id(id)
+    lvol.size = new_size
+    lvol.write_to_db(db_controller.kv_store)
+    logger.info("Done")
+
+    return True, None
 
-    if not error:
-        lvol = db_controller.get_lvol_by_id(id)
-        lvol.size = new_size
-        lvol.write_to_db(db_controller.kv_store)
-        logger.info("Done")
-        return True
-    else:
-        return False
 
 
 def set_read_only(id):

{sbcli_dev-17.2.0 → sbcli_dev-17.2.2}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=17.2.0
+SIMPLY_BLOCK_VERSION=17.2.2
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=public.ecr.aws/simply-block/ultra:main-latest

{sbcli_dev-17.2.0 → sbcli_dev-17.2.2}/simplyblock_core/models/lvol_model.py

@@ -51,6 +51,7 @@ class LVol(BaseModel):
     subsys_port: int = 9090
     nvme_dev: NVMeDevice = None
     pool_uuid: str = ""
+    pool_name: str = ""
     pvc_name: str = ""
     r_mbytes_per_sec: int = 0
     rw_ios_per_sec: int = 0

{sbcli_dev-17.2.0 → sbcli_dev-17.2.2}/simplyblock_core/services/cap_monitor.py

@@ -32,7 +32,7 @@ while True:
                 logger.warning(f"Cluster absolute cap critical, util: {size_util}% of cluster util: {cl.cap_crit}, "
                                f"putting the cluster in read_only mode")
                 if cl.id in last_event:
-                    diff = datetime.now(timezone.utc) - datetime.fromisoformat(last_event[cl.id]["date"])
+                    diff = datetime.now(timezone.utc) - datetime.fromtimestamp(last_event[cl.id]["date"]/1000, timezone.utc)
                     if diff and diff.total_seconds() > 60 * 15:
                         ev = cluster_events.cluster_cap_crit(cl, size_util)
                         if ev:

{sbcli_dev-17.2.0 → sbcli_dev-17.2.2}/simplyblock_web/blueprints/web_api_lvol.py

@@ -38,13 +38,6 @@ def list_lvols(uuid):
     data = []
     for lvol in lvols:
         tmp = lvol.get_clean_dict()
-        tmp['pool_name'] = lvol.pool_uuid
-        # records_list = lvol_controller.get_io_stats(lvol.get_id(), history=None, parse_sizes=False)
-        # records_list = False
-        # if records_list:
-        #     tmp['iostats'] = records_list
-        # else:
-        tmp['iostats'] = []
         data.append(tmp)
     return utils.get_response(data)
 
@@ -266,8 +259,8 @@ def resize_lvol(uuid):
 
     new_size = core_utils.parse_size(cl_data['size'])
 
-    ret = lvol_controller.resize_lvol(uuid, new_size)
-    return utils.get_response(ret)
+    ret, error = lvol_controller.resize_lvol(uuid, new_size)
+    return utils.get_response(ret, error)
 
 
 @bp.route('/lvol/connect/<string:uuid>', methods=['GET'])