sbcli-hmdi 0.0.45__tar.gz → 0.0.47__tar.gz

{sbcli_hmdi-0.0.45 → sbcli_hmdi-0.0.47}/PKG-INFO

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

{sbcli_hmdi-0.0.45 → sbcli_hmdi-0.0.47}/sbcli_hmdi.egg-info/PKG-INFO

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

{sbcli_hmdi-0.0.45 → sbcli_hmdi-0.0.47}/simplyblock_core/controllers/lvol_controller.py

@@ -792,8 +792,9 @@ def delete_lvol_from_node(lvol_id, node_id, clear_data=True):
     rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
 
     # 1- remove subsystem
-    logger.info(f"Removing subsystem")
-    ret = rpc_client.subsystem_delete(lvol.nqn)
+    if rpc_client.subsystem_list(lvol.nqn):
+        logger.info(f"Removing subsystem")
+        rpc_client.subsystem_delete(lvol.nqn)
 
     # 2- remove bdevs
     logger.info(f"Removing bdev stack")
@@ -1192,22 +1193,37 @@ def resize_lvol(id, new_size):
 
     size_in_mib = int(new_size / (1000 * 1000))
 
+    error = False
+    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)
+        for iface in sec_node.data_nics:
+            if iface.ip4_address:
+                ret = sec_node_rpc_client.nvmf_subsystem_listener_set_ana_state(
+                    lvol.nqn, iface.ip4_address, lvol.subsys_port, False, ana="inaccessible")
+
     if snode.status == StorageNode.STATUS_ONLINE:
 
         rpc_client = RPCClient(
             snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
+        for iface in snode.data_nics:
+            if iface.ip4_address:
+                ret = rpc_client.nvmf_subsystem_listener_set_ana_state(
+                    lvol.nqn, iface.ip4_address, lvol.subsys_port, False, ana="inaccessible")
+
         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
+            error = True
 
         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)
@@ -1218,26 +1234,45 @@ 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"Failed to revert size for lvol on node {snode.get_id()}, LVol current size: {utils.humanbytes(new_size)}")
-                    return False
+                    error = True
 
     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
+            error = True
+        else:
+            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()}")
+                error = True
 
-    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
+    if snode.status == StorageNode.STATUS_ONLINE:
+        rpc_client = RPCClient(
+            snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
+        for iface in snode.data_nics:
+            if iface.ip4_address:
+                ret = rpc_client.nvmf_subsystem_listener_set_ana_state(
+                    lvol.nqn, iface.ip4_address, lvol.subsys_port, True)
+
+    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)
+        for iface in sec_node.data_nics:
+            if iface.ip4_address:
+                ret = sec_node_rpc_client.nvmf_subsystem_listener_set_ana_state(
+                    lvol.nqn, iface.ip4_address, lvol.subsys_port, False)
+
+    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_hmdi-0.0.45 → sbcli_hmdi-0.0.47}/simplyblock_core/env_var

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

{sbcli_hmdi-0.0.45 → sbcli_hmdi-0.0.47}/simplyblock_core/models/storage_node.py

@@ -53,7 +53,7 @@ class StorageNode(BaseNodeObject):
     lvstore_stack: List[dict] = []
     lvstore_stack_secondary_1: List[dict] = []
     lvstore_stack_secondary_2: List[dict] = []
-    lvol_subsys_port: int = 4420
+    lvol_subsys_port: int = 0
     max_lvol: int = 0
     max_prov: int = 0
     max_snap: int = 0