sbcli-hmdi 0.0.13__tar.gz → 0.0.14__tar.gz

{sbcli_hmdi-0.0.13 → sbcli_hmdi-0.0.14}/PKG-INFO

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

{sbcli_hmdi-0.0.13 → sbcli_hmdi-0.0.14}/sbcli_hmdi.egg-info/PKG-INFO

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

{sbcli_hmdi-0.0.13 → sbcli_hmdi-0.0.14}/simplyblock_core/controllers/lvol_controller.py

@@ -861,11 +861,6 @@ def delete_lvol(id_or_name, force_delete=False):
     #         lvol.write_to_db(db_controller.kv_store)
     #         return True
 
-    if snode.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_REMOVED]:
-        logger.error(f"Node status is not online or removed, node: {snode.get_id()}, status: {snode.status}")
-        if not force_delete:
-            return False
-
     # set status
     lvol.status = LVol.STATUS_IN_DELETION
     lvol.write_to_db(db_controller.kv_store)
@@ -878,66 +873,95 @@ def delete_lvol(id_or_name, force_delete=False):
                 caching_node_controller.disconnect(cnode.get_id(), lvol.get_id())
 
     if lvol.ha_type == 'single':
+        if snode.status  != StorageNode.STATUS_ONLINE:
+            logger.error(f"Node status is not online, node: {snode.get_id()}, status: {snode.status}")
+            if not force_delete:
+                return False
+
         ret = delete_lvol_from_node(lvol.get_id(), lvol.node_id)
         if not ret:
             return False
+
+
     elif lvol.ha_type == "ha":
 
         sec_node = db_controller.get_storage_node_by_id(snode.secondary_node_id)
 
-        if sec_node.status not in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_OFFLINE, StorageNode.STATUS_REMOVED]:
-            logger.error(f"Secondary node status is not online or offline, node: {sec_node.get_id()}, status: {sec_node.status}")
-            if not force_delete:
-                return False
-
         sec_rpc_client = RPCClient(
             sec_node.mgmt_ip,
             sec_node.rpc_port,
             sec_node.rpc_username,
             sec_node.rpc_password, timeout=5, retry=1)
 
-        ret = sec_rpc_client.subsystem_delete(lvol.nqn)
-        ret = sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=lvol.lvs_name)
-        if not ret:
-            logger.error(f"Failed to set leader for secondary node: {sec_node.get_id()}")
-            if not force_delete:
-                return False
+        if snode.status != StorageNode.STATUS_ONLINE:
 
-        time.sleep(1)
-        rpc_client.subsystem_delete(lvol.nqn)
-        rpc_client.bdev_lvol_set_leader(True, lvs_name=lvol.lvs_name)
-        if not ret:
-            logger.error(f"Failed to set leader for primary node: {snode.get_id()}")
-            if not force_delete:
-                return False
+            if sec_node.status != StorageNode.STATUS_ONLINE:
+                logger.error(f"Secondary node status is not online or offline, node: {sec_node.get_id()}, status: {sec_node.status}")
+                if not force_delete:
+                    return False
 
-        time.sleep(1)
+            ret = sec_rpc_client.bdev_lvol_set_leader(True, lvs_name=lvol.lvs_name)
+            if not ret:
+                logger.error(f"Failed to set leader for secondary node: {sec_node.get_id()}")
+                if not force_delete:
+                    return False
+            ret = delete_lvol_from_node(lvol.get_id(), sec_node.get_id())
+            if not ret:
+                logger.error(f"Failed to delete lvol from node: {sec_node.get_id()}")
+                if not force_delete:
+                    return False
+
+        else:
+
+
+            if sec_node.status == StorageNode.STATUS_ONLINE:
+                ret = sec_rpc_client.subsystem_delete(lvol.nqn)
+
+
+        # ret = sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=lvol.lvs_name)
+        # if not ret:
+        #     logger.error(f"Failed to set leader for secondary node: {sec_node.get_id()}")
+        #     if not force_delete:
+        #         return False
+        #
+        # time.sleep(1)
+        # rpc_client.subsystem_delete(lvol.nqn)
+        # rpc_client.bdev_lvol_set_leader(True, lvs_name=lvol.lvs_name)
+        # if not ret:
+        #     logger.error(f"Failed to set leader for primary node: {snode.get_id()}")
+        #     if not force_delete:
+        #         return False
+        #
+        # time.sleep(1)
         ret = delete_lvol_from_node(lvol.get_id(), lvol.node_id)
         if not ret:
             logger.error(f"Failed to delete lvol from node: {snode.get_id()}")
             if not force_delete:
                 return False
 
-        time.sleep(1)
-        ret = delete_lvol_from_node(lvol.get_id(), snode.secondary_node_id)
-        if not ret:
-            logger.error(f"Failed to delete lvol from node: {sec_node.get_id()}")
-            if not force_delete:
-                return False
+        # time.sleep(1)
 
-        time.sleep(1)
-        ret = sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=lvol.lvs_name)
-        if not ret:
-            logger.error(f"Failed to set leader for secondary node: {sec_node.get_id()}")
-            if not force_delete:
-                return False
+        if sec_node.status == StorageNode.STATUS_ONLINE:
 
-        time.sleep(1)
-        ret = rpc_client.bdev_lvol_set_leader(True, lvs_name=lvol.lvs_name)
-        if not ret:
-            logger.error(f"Failed to set leader for primary node: {snode.get_id()}")
-            if not force_delete:
-                return False
+            ret = delete_lvol_from_node(lvol.get_id(), snode.secondary_node_id)
+            if not ret:
+                logger.error(f"Failed to delete lvol from node: {sec_node.get_id()}")
+                if not force_delete:
+                    return False
+        #
+        # time.sleep(1)
+        # ret = sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=lvol.lvs_name)
+        # if not ret:
+        #     logger.error(f"Failed to set leader for secondary node: {sec_node.get_id()}")
+        #     if not force_delete:
+        #         return False
+        #
+        # time.sleep(1)
+        # ret = rpc_client.bdev_lvol_set_leader(True, lvs_name=lvol.lvs_name)
+        # if not ret:
+        #     logger.error(f"Failed to set leader for primary node: {snode.get_id()}")
+        #     if not force_delete:
+        #         return False
 
     lvol_events.lvol_delete(lvol)
     lvol.remove(db_controller.kv_store)

{sbcli_hmdi-0.0.13 → sbcli_hmdi-0.0.14}/simplyblock_core/env_var

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

{sbcli_hmdi-0.0.13 → sbcli_hmdi-0.0.14}/simplyblock_core/storage_node_ops.py

@@ -2868,15 +2868,15 @@ def recreate_lvstore(snode):
         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, lvol.subsys_port, False, "inaccessible")
+            # 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, lvol.subsys_port, False, "inaccessible")
 
-            # sec_node_api = SNodeClient(sec_node.api_endpoint)
-            # sec_node_api.firewall_set_port(snode.lvol_subsys_port, "tcp", "block")
+            sec_node_api = SNodeClient(sec_node.api_endpoint)
+            sec_node_api.firewall_set_port(snode.lvol_subsys_port, "tcp", "block")
 
             sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=snode.lvstore)
             sec_rpc_client.bdev_distrib_force_to_non_leader(snode.jm_vuid)
@@ -2954,13 +2954,16 @@ def recreate_lvstore(snode):
 
     if sec_node and sec_node.status == StorageNode.STATUS_ONLINE:
         time.sleep(10)
-        sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password, timeout=3, retry=2)
-        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, lvol.subsys_port, False)
+        sec_node_api = SNodeClient(sec_node.api_endpoint)
+        sec_node_api.firewall_set_port(snode.lvol_subsys_port, "tcp", "allow")
+
+        # sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password, timeout=3, retry=2)
+        # 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, lvol.subsys_port, False)
     return True