sbcli-hmdi 0.0.9__tar.gz → 0.0.11__tar.gz

{sbcli_hmdi-0.0.9 → sbcli_hmdi-0.0.11}/PKG-INFO

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

{sbcli_hmdi-0.0.9 → sbcli_hmdi-0.0.11}/sbcli_hmdi.egg-info/PKG-INFO

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

{sbcli_hmdi-0.0.9 → sbcli_hmdi-0.0.11}/simplyblock_core/controllers/lvol_controller.py

@@ -527,7 +527,7 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
             logger.error(msg)
             return False, msg
 
-        lvol_bdev, error = add_lvol_on_node(lvol, sec_node)
+        lvol_bdev, error = add_lvol_on_node(lvol, sec_node, ha_inode_self=1, sec_is_prime=True)
         if error:
             lvol.remove(db_controller.kv_store)
             return False, error
@@ -546,7 +546,7 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
     return lvol.uuid, None
 
 
-def _create_bdev_stack(lvol, snode):
+def _create_bdev_stack(lvol, snode, sec_is_prime=False):
     rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
 
     created_bdevs = []
@@ -569,14 +569,14 @@ def _create_bdev_stack(lvol, snode):
             ret = rpc_client.create_lvstore(**params)
 
         elif type == "bdev_lvol":
-            if snode.is_secondary_node:
+            if snode.is_secondary_node and not sec_is_prime:
                 ret = rpc_client.bdev_lvol_register(
                     lvol.lvol_bdev, lvol.lvs_name, lvol.lvol_uuid, lvol.blobid, lvol.lvol_priority_class)
             else:
                 ret = rpc_client.create_lvol(**params)
 
         elif type == "bdev_lvol_clone":
-            if snode.is_secondary_node:
+            if snode.is_secondary_node and not sec_is_prime:
                 ret = rpc_client.bdev_lvol_clone_register(
                     lvol.lvol_bdev, lvol.snapshot_name, lvol.lvol_uuid, lvol.blobid)
             else:
@@ -598,24 +598,24 @@ def _create_bdev_stack(lvol, snode):
     return True, None
 
 
-def add_lvol_on_node(lvol, snode, ha_comm_addrs=None, ha_inode_self=0):
+def add_lvol_on_node(lvol, snode, ha_comm_addrs=None, ha_inode_self=0, sec_is_prime=False):
     rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
 
-    if snode.is_secondary_node:
+    if snode.is_secondary_node and not sec_is_prime:
         rpc_client.bdev_lvol_set_leader(False, lvs_name=lvol.lvs_name)
 
     else:
 
-        lvol_count = len(db_controller.get_lvols_by_node_id(snode.get_id()))
-        if lvol_count >= snode.max_lvol:
-            error = f"Too many lvols on node: {snode.get_id()}, max lvols reached: {lvol_count}"
-            logger.error(error)
-            return False, error
+        if not sec_is_prime:
+            lvol_count = len(db_controller.get_lvols_by_node_id(snode.get_id()))
+            if lvol_count >= snode.max_lvol:
+                error = f"Too many lvols on node: {snode.get_id()}, max lvols reached: {lvol_count}"
+                logger.error(error)
+                return False, error
 
         rpc_client.bdev_lvol_set_leader(True, lvs_name=lvol.lvs_name)
 
-
-    ret, msg = _create_bdev_stack(lvol, snode)
+    ret, msg = _create_bdev_stack(lvol, snode, sec_is_prime)
     if not ret:
         return False, msg
 
@@ -1165,33 +1165,48 @@ def resize_lvol(id, new_size):
     logger.info(f"Resizing LVol: {lvol.get_id()} on primary node: {snode.get_id()}")
     logger.info(f"Current size: {utils.humanbytes(lvol.size)}, new size: {utils.humanbytes(new_size)}")
 
-    # creating RPCClient instance
-    rpc_client = RPCClient(
-        snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
-    rpc_client.bdev_lvol_set_leader(True, lvs_name=lvol.lvs_name)
-    size_in_mib = int(new_size / (1000*1000))
-    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()}")
-        return False
+    size_in_mib = int(new_size / (1000 * 1000))
 
-    if lvol.ha_type == "ha":
-        sec_node = db_controller.get_storage_node_by_id(snode.secondary_node_id)
-        if sec_node and sec_node.status == StorageNode.STATUS_ONLINE:
-            sec_node_rpc_client = RPCClient(
-                sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password)
-            time.sleep(3)
-            logger.info(f"Resizing LVol: {lvol.get_id()} on secondary node: {sec_node.get_id()}")
-            sec_node_rpc_client.bdev_lvol_set_leader(False, lvs_name=lvol.lvs_name)
-            ret = sec_node_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()}")
-                logger.info(f"Revert size on node {snode.get_id()}")
-                size_in_mib = int(lvol.size / (1000 * 1000))
-                ret = rpc_client.bdev_lvol_resize(f"{lvol.lvs_name}/{lvol.lvol_bdev}", size_in_mib)
+    if snode.status == StorageNode.STATUS_ONLINE:
+
+        rpc_client = RPCClient(
+            snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
+        rpc_client.bdev_lvol_set_leader(True, lvs_name=lvol.lvs_name)
+        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()}")
+            return False
+
+        if lvol.ha_type == "ha":
+            sec_node = db_controller.get_storage_node_by_id(snode.secondary_node_id)
+            if sec_node and sec_node.status == StorageNode.STATUS_ONLINE:
+                sec_node_rpc_client = RPCClient(
+                    sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password)
+                time.sleep(3)
+                logger.info(f"Resizing LVol: {lvol.get_id()} on secondary node: {sec_node.get_id()}")
+                sec_node_rpc_client.bdev_lvol_set_leader(False, lvs_name=lvol.lvs_name)
+                ret = sec_node_rpc_client.bdev_lvol_resize(f"{lvol.lvs_name}/{lvol.lvol_bdev}", size_in_mib)
                 if not ret:
-                    logger.error(f"Failed to revert size for lvol on node {snode.get_id()}, LVol current size: {utils.humanbytes(new_size)}")
-                return False
+                    logger.error(f"Error resizing lvol on node: {sec_node.get_id()}")
+                    logger.info(f"Revert size on node {snode.get_id()}")
+                    size_in_mib = int(lvol.size / (1000 * 1000))
+                    ret = rpc_client.bdev_lvol_resize(f"{lvol.lvs_name}/{lvol.lvol_bdev}", size_in_mib)
+                    if not ret:
+                        logger.error(f"Failed to revert size for lvol on node {snode.get_id()}, LVol current size: {utils.humanbytes(new_size)}")
+                    return False
+
+    else:
+        sec_node = db_controller.get_storage_node_by_id(snode.secondary_node_id)
+        if not sec_node or sec_node.status != StorageNode.STATUS_ONLINE:
+            msg = f"Host nodes are not online"
+            logger.error(msg)
+            return False
+
+        sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password)
+        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()}")
+            return False
 
     lvol = db_controller.get_lvol_by_id(id)
     lvol.size = new_size

{sbcli_hmdi-0.0.9 → sbcli_hmdi-0.0.11}/simplyblock_core/controllers/snapshot_controller.py

@@ -452,7 +452,7 @@ def clone(snapshot_id, clone_name, new_size=0):
             logger.error(msg)
             return False, msg
 
-        lvol_bdev, error = lvol_controller.add_lvol_on_node(lvol, sec_node)
+        lvol_bdev, error = lvol_controller.add_lvol_on_node(lvol, sec_node, ha_inode_self=1, sec_is_prime=True)
         if error:
             return False, error
         lvol.nodes = [snode.get_id(), sec_node.get_id()]

{sbcli_hmdi-0.0.9 → sbcli_hmdi-0.0.11}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-hmdi
-SIMPLY_BLOCK_VERSION=0.0.9
+SIMPLY_BLOCK_VERSION=0.0.11
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:hmdi
 DOCKER_USER=hamdysimplyblock