sbcli-dev 10.1.98__tar.gz → 10.2.0__tar.gz

{sbcli_dev-10.1.98 → sbcli_dev-10.2.0}/PKG-INFO

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

{sbcli_dev-10.1.98 → sbcli_dev-10.2.0}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.1.98 → sbcli_dev-10.2.0}/simplyblock_cli/cli.py

@@ -300,7 +300,7 @@ class CLIWrapper:
                                  default=0, choices=range(128))
         sub_command.add_argument("--max-queue-size", help='The max size the queue will grow', type=int, default=128)
         sub_command.add_argument("--inflight-io-threshold", help='The number of inflight IOs allowed before the IO queuing starts', type=int, default=4)
-        sub_command.add_argument("--disable-qos", help='Disable qos bdev for storage nodes', action='store_false', dest='enable_qos')
+        sub_command.add_argument("--enable-qos", help='Enable qos bdev for storage nodes', action='store_true', dest='enable_qos')
         sub_command.add_argument("--strict-node-anti-affinity", help='Enable strict node anti affinity for storage nodes', action='store_true')
 
 

{sbcli_dev-10.1.98 → sbcli_dev-10.2.0}/simplyblock_core/controllers/lvol_controller.py

@@ -187,10 +187,11 @@ def _get_next_3_nodes(cluster_id, lvol_size=0):
             #     continue
             #
             online_nodes.append(node)
+            lvols = db_controller.get_lvols_by_node_id(node.get_id()) or []
             # node_stat_list = db_controller.get_node_stats(node, limit=1000)
             # combined_record = utils.sum_records(node_stat_list)
             node_st = {
-                "lvol": node.lvols+1,
+                "lvol": len(lvols)+1,
                 # "cpu": 1 + (node.cpu * node.cpu_hz),
                 # "r_io": combined_record.read_io_ps,
                 # "w_io": combined_record.write_io_ps,
@@ -523,14 +524,14 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
             host_node.secondary_node_id]
         lvol.nodes = nodes_ids
 
-    host_node = db_controller.get_storage_node_by_id(host_node.get_id())
-    host_node.lvols += 1
-    host_node.write_to_db(db_controller.kv_store)
+    # host_node = db_controller.get_storage_node_by_id(host_node.get_id())
+    # host_node.lvols += 1
+    # host_node.write_to_db(db_controller.kv_store)
 
-    pool = db_controller.get_pool_by_id(pool.get_id())
+    # pool = db_controller.get_pool_by_id(pool.get_id())
     lvol.pool_uuid = pool.get_id()
-    pool.lvols += 1
-    pool.write_to_db(db_controller.kv_store)
+    # pool.lvols += 1
+    # pool.write_to_db(db_controller.kv_store)
 
     lvol.write_to_db(db_controller.kv_store)
     lvol_events.lvol_create(lvol)
@@ -608,7 +609,8 @@ def add_lvol_on_node(lvol, snode, ha_comm_addrs=None, ha_inode_self=0):
         huge_free = result["memory_details"]["huge_free"]
 
         total_node_capacity = db_controller.get_snode_size(snode.get_id())
-        error = utils.validate_add_lvol_or_snap_on_node(memory_free, huge_free, snode.max_lvol, lvol.size,  total_node_capacity, snode.lvols)
+        lvols = len(db_controller.get_lvols_by_node_id(snode.get_id()))
+        error = utils.validate_add_lvol_or_snap_on_node(memory_free, huge_free, snode.max_lvol, lvol.size,  total_node_capacity, lvols)
         if error:
             logger.error(error)
             return False, f"Failed to add lvol on node {snode.get_id()}"
@@ -929,16 +931,16 @@ def delete_lvol(id_or_name, force_delete=False):
                 return False
 
     # remove from db
-    snode = db_controller.get_storage_node_by_id(lvol.node_id)
-    # logger.debug(snode)
-    logger.debug(f"removing lvol: {lvol.get_id()} from node {snode.get_id()}")
-    snode.lvols -= 1
-    snode.write_to_db(db_controller.kv_store)
-
-    # remove from pool
-    pool = db_controller.get_pool_by_id(lvol.pool_uuid)
-    pool.lvols -= 1
-    pool.write_to_db(db_controller.kv_store)
+    # snode = db_controller.get_storage_node_by_id(lvol.node_id)
+    # # logger.debug(snode)
+    # logger.debug(f"removing lvol: {lvol.get_id()} from node {snode.get_id()}")
+    # snode.lvols -= 1
+    # snode.write_to_db(db_controller.kv_store)
+
+    # # remove from pool
+    # pool = db_controller.get_pool_by_id(lvol.pool_uuid)
+    # pool.lvols -= 1
+    # pool.write_to_db(db_controller.kv_store)
 
     lvol_events.lvol_delete(lvol)
     lvol.remove(db_controller.kv_store)

{sbcli_dev-10.1.98 → sbcli_dev-10.2.0}/simplyblock_core/controllers/pool_controller.py

@@ -144,13 +144,14 @@ def list_pools(is_json, cluster_id=None):
     pools = db_controller.get_pools(cluster_id)
     data = []
     for pool in pools:
+        lvs = db_controller.get_lvols_by_pool_id(pool.get_id()) or []
         data.append({
             "UUID": pool.get_id(),
             "Name": pool.pool_name,
             "Capacity": utils.humanbytes(get_pool_total_capacity(pool.get_id())),
             "Max size": utils.humanbytes(pool.pool_max_size),
             "LVol Max Size": utils.humanbytes(pool.lvol_max_size),
-            "LVols": f"{pool.lvols}",
+            "LVols": f"{len(lvs)}",
             "QOS": f"{pool.has_qos()}",
             "Status": pool.status,
         })
@@ -202,7 +203,7 @@ def get_capacity(pool_id):
             "util_percent": 0,
             "util": 0,
         })
-    if pool.lvols:
+    if total_size:
         out.append({
             "device name": "Total",
             "provisioned": utils.humanbytes(total_size),

{sbcli_dev-10.1.98 → sbcli_dev-10.2.0}/simplyblock_core/controllers/snapshot_controller.py

@@ -291,8 +291,9 @@ def clone(snapshot_id, clone_name, new_size=0):
     memory_free = result["memory_details"]["free"]
     huge_free = result["memory_details"]["huge_free"]
     total_node_capacity = db_controller.get_snode_size(snode.get_id())
+    lvols = db_controller.get_lvols_by_node_id(snode.get_id())
     error = utils.validate_add_lvol_or_snap_on_node(
-        memory_free, huge_free, snode.max_lvol, snap.lvol.size,  total_node_capacity, snode.lvols)
+        memory_free, huge_free, snode.max_lvol, snap.lvol.size,  total_node_capacity, len(lvols))
     if error:
         logger.error(error)
         return False, f"Failed to add lvol on node {snode.get_id()}"
@@ -417,12 +418,12 @@ def clone(snapshot_id, clone_name, new_size=0):
     # lvol.mem_diff = diff
     # lvol.write_to_db(db_controller.kv_store)
 
-    pool = db_controller.get_pool_by_id(snap.lvol.pool_uuid)
-    pool.lvols += 1
-    pool.write_to_db(db_controller.kv_store)
-    snode = db_controller.get_storage_node_by_id(snode.get_id())
-    snode.lvols += 1
-    snode.write_to_db(db_controller.kv_store)
+    # pool = db_controller.get_pool_by_id(snap.lvol.pool_uuid)
+    # pool.lvols += 1
+    # pool.write_to_db(db_controller.kv_store)
+    # snode = db_controller.get_storage_node_by_id(snode.get_id())
+    # snode.lvols += 1
+    # snode.write_to_db(db_controller.kv_store)
 
     if snap.snap_ref_id:
         ref_snap = db_controller.get_snapshot_by_id(snap.snap_ref_id)

{sbcli_dev-10.1.98 → sbcli_dev-10.2.0}/simplyblock_core/controllers/tasks_controller.py

@@ -79,8 +79,12 @@ def _add_task(function_name, cluster_id, node_id, device_id,
 def add_device_mig_task(device_id):
     device = db_controller.get_storage_device_by_id(device_id)
     for node in db_controller.get_storage_nodes_by_cluster_id(device.cluster_id):
-        if node.status == StorageNode.STATUS_REMOVED or node.lvols==0:
+        if node.status == StorageNode.STATUS_REMOVED:
+            continue
+        lvols = db_controller.get_lvols_by_node_id(node.get_id())
+        if not lvols:
             continue
+
         for bdev in node.lvstore_stack:
             if bdev['type'] == "bdev_distr":
                 _add_task(JobSchedule.FN_DEV_MIG, device.cluster_id, node.get_id(), device.get_id(),

{sbcli_dev-10.1.98 → sbcli_dev-10.2.0}/simplyblock_core/env_var

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

{sbcli_dev-10.1.98 → sbcli_dev-10.2.0}/simplyblock_core/storage_node_ops.py

@@ -1463,13 +1463,14 @@ def remove_storage_node(node_id, force_remove=False, force_migrate=False):
                 if task.status != JobSchedule.STATUS_DONE and task.canceled is False:
                     tasks_controller.cancel_task(task.get_id())
 
-    if snode.lvols:
+    lvols = db_controller.get_lvols_by_node_id(node_id)
+    if lvols:
         if force_migrate:
-            for lvol in db_controller.get_lvols_by_node_id(node_id):
+            for lvol in lvols:
                 pass
                 # lvol_controller.migrate(lvol_id)
         elif force_remove:
-            for lvol in db_controller.get_lvols_by_node_id(node_id):
+            for lvol in lvols:
                 lvol_controller.delete_lvol(lvol.get_id(), True)
         else:
             logger.error("LVols found on the storage node, use --force-remove or --force-migrate")
@@ -1943,12 +1944,13 @@ def list_storage_nodes(is_json, cluster_id=None):
         for dev in node.nvme_devices:
             if dev.status == NVMeDevice.STATUS_ONLINE:
                 online_devices += 1
+        lvs = db_controller.get_lvols_by_node_id(node.get_id()) or []
         data.append({
             "UUID": node.uuid,
             "Hostname": node.hostname,
             "Management IP": node.mgmt_ip,
             "Devices": f"{total_devices}/{online_devices}",
-            "LVols": f"{node.lvols}",
+            "LVols": f"{len(lvs)}",
             "Status": node.status,
             "Health": node.health_check,
             "Up time": uptime,
@@ -2161,18 +2163,16 @@ def suspend_storage_node(node_id, force=False):
         snode.rpc_username, snode.rpc_password, timeout=5, retry=1)
 
     nodes = []
+    lvols = db_controller.get_lvols_by_node_id(node_id)
     if snode.is_secondary_node:
         ret = db_controller.get_primary_storage_nodes_by_secondary_node_id(node_id)
         if ret:
             nodes.extend(ret)
-    elif snode.lvols > 0:
+    elif lvols:
         nodes.append(snode)
 
 
     for node in nodes:
-        if node.lvols==0:
-            continue
-
         for lvol in db_controller.get_lvols_by_node_id(node.get_id()):
             for iface in snode.data_nics:
                 if iface.ip4_address:
@@ -2235,15 +2235,16 @@ def resume_storage_node(node_id):
         snode.rpc_username, snode.rpc_password)
 
     nodes = []
+    lvols = db_controller.get_lvols_by_node_id(node_id)
     if snode.is_secondary_node:
         ret = db_controller.get_primary_storage_nodes_by_secondary_node_id(node_id)
         if ret:
             nodes.extend(ret)
-    elif snode.lvols > 0:
+    elif lvols:
         nodes.append(snode)
 
     for node in nodes:
-        if node.lvols==0 or not node.lvstore:
+        if not node.lvstore:
             continue
 
         if node.get_id() != snode.get_id():
@@ -2255,7 +2256,7 @@ def resume_storage_node(node_id):
                                 lvol.nqn, iface.ip4_address, "4420", False)
 
 
-    if not snode.is_secondary_node and snode.lvols > 0:
+    if not snode.is_secondary_node:
         for lvol in db_controller.get_lvols_by_node_id(snode.get_id()):
             for iface in snode.data_nics:
                 if iface.ip4_address:

{sbcli_dev-10.1.98 → sbcli_dev-10.2.0}/simplyblock_web/blueprints/web_api_pool.py

@@ -31,7 +31,10 @@ def list_pools(uuid):
         pools = db_controller.get_pools(cluster_id)
     data = []
     for pool in pools:
-        data.append(pool.get_clean_dict())
+        d = pool.get_clean_dict()
+        lvs = db_controller.get_lvols_by_pool_id(pool.get_id()) or []
+        d['lvols'] = len(lvs)
+        data.append(d)
     return utils.get_response(data)
 
 
@@ -168,7 +171,7 @@ def pool_capacity(uuid):
             "util_percent": 0,
             "util": 0,
         })
-    if pool.lvols:
+    if total_size:
         out.append({
             "device name": "Total",
             "provisioned": total_size,

{sbcli_dev-10.1.98 → sbcli_dev-10.2.0}/simplyblock_web/blueprints/web_api_storage_node.py

@@ -34,6 +34,8 @@ def list_storage_nodes(uuid):
     for node in nodes:
         d = node.get_clean_dict()
         d['status_code'] = node.get_status_code()
+        lvs = db_controller.get_lvols_by_node_id(node.get_id()) or []
+        d['lvols'] = len(lvs)
         data.append(d)
     return utils.get_response(data)