sbcli-dev 11.0.4__tar.gz → 11.0.6__tar.gz

{sbcli_dev-11.0.4 → sbcli_dev-11.0.6}/PKG-INFO

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

{sbcli_dev-11.0.4 → sbcli_dev-11.0.6}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-11.0.4 → sbcli_dev-11.0.6}/simplyblock_core/controllers/lvol_controller.py

@@ -10,7 +10,8 @@ from datetime import datetime
 from typing import Tuple
 
 from simplyblock_core import utils, constants, distr_controller
-from simplyblock_core.controllers import snapshot_controller, pool_controller, lvol_events, caching_node_controller
+from simplyblock_core.controllers import snapshot_controller, pool_controller, lvol_events, caching_node_controller, \
+    tasks_controller
 from simplyblock_core.db_controller import DBController
 from simplyblock_core.models.nvme_device import NVMeDevice
 from simplyblock_core.models.pool import Pool
@@ -175,6 +176,11 @@ def _get_next_3_nodes(cluster_id, lvol_size=0):
             continue
 
         if node.status == node.STATUS_ONLINE:
+
+            lvol_count = len(db_controller.get_lvols_by_node_id(node.get_id()))
+            if lvol_count >= node.max_lvols:
+                continue
+
             # Validate Eligible nodes for adding lvol
             # snode_api = SNodeClient(node.api_endpoint)
             # result, _ = snode_api.info()
@@ -187,11 +193,10 @@ 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": len(lvols)+1,
+                "lvol": lvol_count+1,
                 # "cpu": 1 + (node.cpu * node.cpu_hz),
                 # "r_io": combined_record.read_io_ps,
                 # "w_io": combined_record.write_io_ps,
@@ -583,18 +588,12 @@ def add_lvol_on_node(lvol, snode, ha_comm_addrs=None, ha_inode_self=0):
         rpc_client.bdev_lvol_set_leader(False, lvs_name=lvol.lvs_name)
 
     else:
-        # Validate adding lvol on storage node
-        snode_api = SNodeClient(snode.api_endpoint)
-        result, _ = snode_api.info()
-        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 = 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:
+
+        lvol_count = len(db_controller.get_lvols_by_node_id(snode.get_id()))
+        if lvol_count >= snode.max_lvols:
+            error = f"Too many lvols on node: {snode.get_id()}, max lvols reached: {lvol_count}"
             logger.error(error)
-            return False, f"Failed to add lvol on node {snode.get_id()}"
+            return False, error
 
         rpc_client.bdev_lvol_set_leader(True, lvs_name=lvol.lvs_name)
 

{sbcli_dev-11.0.4 → sbcli_dev-11.0.6}/simplyblock_core/controllers/snapshot_controller.py

@@ -78,25 +78,25 @@ def add(lvol_id, snapshot_name):
 
 
 ##############################################################################
-    # Validate adding snap on storage node
-    snode_api = SNodeClient(snode.api_endpoint)
-    result, _ = snode_api.info()
-    memory_free = result["memory_details"]["free"]
-    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_snap,
-        lvol.size,
-        total_node_capacity,
-        len(db_controller.get_snapshots_by_node_id(lvol.node_id)))
-
-    if error:
-        logger.error(f"Failed to add snap on node {lvol.node_id}")
-        logger.error(error)
-        return False
+    # # Validate adding snap on storage node
+    # snode_api = SNodeClient(snode.api_endpoint)
+    # result, _ = snode_api.info()
+    # memory_free = result["memory_details"]["free"]
+    # 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_snap,
+    #     lvol.size,
+    #     total_node_capacity,
+    #     len(db_controller.get_snapshots_by_node_id(lvol.node_id)))
+    #
+    # if error:
+    #     logger.error(f"Failed to add snap on node {lvol.node_id}")
+    #     logger.error(error)
+    #     return False
 
     if pool.pool_max_size > 0:
         total = pool_controller.get_pool_total_capacity(pool.get_id())
@@ -105,12 +105,12 @@ def add(lvol_id, snapshot_name):
             logger.error(msg)
             return False, msg
 
-    if snode.max_snap:
-        cnt = db_controller.get_snapshots_by_node_id(snode.get_id())
-        if cnt and len(cnt)+1 > snode.max_snap:
-            msg = f"Storage node snapshots count must be less than max_snap:{snode.max_snap}"
-            logger.error(msg)
-            return False, msg
+    # if snode.max_snap:
+    #     cnt = db_controller.get_snapshots_by_node_id(snode.get_id())
+    #     if cnt and len(cnt)+1 > snode.max_snap:
+    #         msg = f"Storage node snapshots count must be less than max_snap:{snode.max_snap}"
+    #         logger.error(msg)
+    #         return False, msg
 
 ##############################################################################
 
@@ -337,19 +337,11 @@ def clone(snapshot_id, clone_name, new_size=0):
                           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()
-    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, len(lvols))
-    if error:
+    lvol_count = len(db_controller.get_lvols_by_node_id(snode.get_id()))
+    if lvol_count >= snode.max_lvols:
+        error = f"Too many lvols on node: {snode.get_id()}, max lvols reached: {lvol_count}"
         logger.error(error)
-        return False, f"Failed to add lvol on node {snode.get_id()}"
+        return False, error
 
     if pool.pool_max_size > 0:
         total = pool_controller.get_pool_total_capacity(pool.get_id())
@@ -358,12 +350,6 @@ def clone(snapshot_id, clone_name, new_size=0):
             logger.error(msg)
             return False, msg
 
-    if snode.max_snap:
-        cnt = db_controller.get_snapshots_by_node_id(snode.get_id())
-        if cnt and len(cnt)+1 > snode.max_lvol:
-            msg = f"Storage node LVol count must be less than max_lvol:{snode.max_lvol}"
-            logger.error(msg)
-            return False, msg
 
     cluster = db_controller.get_cluster_by_id(snode.cluster_id)
 

{sbcli_dev-11.0.4 → sbcli_dev-11.0.6}/simplyblock_core/env_var

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

{sbcli_dev-11.0.4 → sbcli_dev-11.0.6}/simplyblock_core/storage_node_ops.py

@@ -2830,25 +2830,6 @@ def recreate_lvstore(snode):
     if snode.is_secondary_node:
         return recreate_lvstore_on_sec(snode)
 
-    sec_node = db_controller.get_storage_node_by_id(snode.secondary_node_id)
-    prim_node_suspend = False
-    lvol_list = db_controller.get_lvols_by_node_id(snode.get_id())
-    if sec_node:
-        if sec_node.status == StorageNode.STATUS_UNREACHABLE:
-            prim_node_suspend = True
-        elif sec_node.status == StorageNode.STATUS_ONLINE:
-            sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password)
-
-            for lvol in lvol_list:
-                if lvol.ha_type == "ha":
-                    for iface in sec_node.data_nics:
-                        if iface.ip4_address:
-                            ret = sec_rpc_client.nvmf_subsystem_listener_set_ana_state(
-                                lvol.nqn, iface.ip4_address, "4420", False, "inaccessible")
-
-            sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=snode.lvstore)
-            sec_rpc_client.bdev_distrib_force_to_non_leader(snode.jm_vuid)
-
     rpc_client = RPCClient(
         snode.mgmt_ip, snode.rpc_port,
         snode.rpc_username, snode.rpc_password, retry=1, timeout=30)
@@ -2877,9 +2858,6 @@ def recreate_lvstore(snode):
 
     time.sleep(2)
 
-    if not lvol_list:
-        prim_node_suspend = False
-
     ret, err = _create_bdev_stack(snode, [], primary_node=snode)
 
     if err:
@@ -2890,6 +2868,71 @@ def recreate_lvstore(snode):
     ret = rpc_client.bdev_examine(snode.raid)
     ret = rpc_client.bdev_wait_for_examine()
     ret = rpc_client.bdev_lvol_set_lvs_groupid(snode.lvstore, snode.jm_vuid)
+    time.sleep(1)
+
+
+    sec_node = db_controller.get_storage_node_by_id(snode.secondary_node_id)
+    prim_node_suspend = False
+    lvol_list = db_controller.get_lvols_by_node_id(snode.get_id())
+    if sec_node:
+        if sec_node.status == StorageNode.STATUS_UNREACHABLE:
+            prim_node_suspend = True
+        elif sec_node.status == StorageNode.STATUS_ONLINE:
+            sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password)
+
+            for lvol in lvol_list:
+                if lvol.ha_type == "ha":
+                    for iface in sec_node.data_nics:
+                        if iface.ip4_address:
+                            ret = sec_rpc_client.nvmf_subsystem_listener_set_ana_state(
+                                lvol.nqn, iface.ip4_address, "4420", False, "inaccessible")
+
+            sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=snode.lvstore)
+            sec_rpc_client.bdev_distrib_force_to_non_leader(snode.jm_vuid)
+            time.sleep(1)
+
+    #
+    # rpc_client = RPCClient(
+    #     snode.mgmt_ip, snode.rpc_port,
+    #     snode.rpc_username, snode.rpc_password, retry=1, timeout=30)
+    #
+    # # connecting to remote devices
+    # logger.info("Connecting to remote devices")
+    # snode = db_controller.get_storage_node_by_id(snode.get_id())
+    # snode.remote_devices = _connect_to_remote_devs(snode)
+    # if snode.enable_ha_jm:
+    #     online_devs = []
+    #     for remote_device in snode.remote_jm_devices:
+    #         if remote_device.status == StorageNode.STATUS_ONLINE:
+    #             online_devs.append(remote_device)
+    #
+    #     if len(online_devs) < 2:
+    #         devs = get_sorted_ha_jms(snode)
+    #         for did in devs:
+    #             dev = db_controller.get_jm_device_by_id(did)
+    #             online_devs.append(dev)
+    #             if len(online_devs) > snode.ha_jm_count - 1:
+    #                 break
+    #
+    #     snode.remote_jm_devices = online_devs
+    #     snode.remote_jm_devices = _connect_to_remote_jm_devs(snode)
+    # snode.write_to_db()
+    #
+    # time.sleep(2)
+    #
+    if not lvol_list:
+        prim_node_suspend = False
+    #
+    # ret, err = _create_bdev_stack(snode, [], primary_node=snode)
+    #
+    # if err:
+    #     logger.error(f"Failed to recreate lvstore on node {snode.get_id()}")
+    #     logger.error(err)
+    #     return False
+    #
+    # ret = rpc_client.bdev_examine(snode.raid)
+    # ret = rpc_client.bdev_wait_for_examine()
+    # ret = rpc_client.bdev_lvol_set_lvs_groupid(snode.lvstore, snode.jm_vuid)
 
     if not prim_node_suspend:
         if snode.jm_vuid: