sbcli-hmdi 0.0.49__tar.gz → 0.0.51__tar.gz

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-hmdi
-Version: 0.0.49
+Version: 0.0.51
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
@@ -24,6 +24,7 @@ Requires-Dist: graypy==2.1.0
 Requires-Dist: boto3
 Requires-Dist: jinja2
 Requires-Dist: argcomplete
+Requires-Dist: jc
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

sbcli_hmdi-0.0.49/sbcli_hmdi.egg-info/requires.txt → sbcli_hmdi-0.0.51/requirements.txt

@@ -16,3 +16,4 @@ graypy==2.1.0
 boto3
 jinja2
 argcomplete
+jc

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.51}/sbcli_hmdi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-hmdi
-Version: 0.0.49
+Version: 0.0.51
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy
@@ -24,6 +24,7 @@ Requires-Dist: graypy==2.1.0
 Requires-Dist: boto3
 Requires-Dist: jinja2
 Requires-Dist: argcomplete
+Requires-Dist: jc
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

sbcli_hmdi-0.0.49/requirements.txt → sbcli_hmdi-0.0.51/sbcli_hmdi.egg-info/requires.txt

@@ -15,4 +15,5 @@ urllib3
 graypy==2.1.0
 boto3
 jinja2
-argcomplete
+argcomplete
+jc

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.51}/simplyblock_core/controllers/health_controller.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+import jc
 
 from simplyblock_core import utils, distr_controller, storage_node_ops
 from simplyblock_core.db_controller import DBController
@@ -102,6 +103,25 @@ def _check_spdk_process_up(ip):
     return False
 
 
+def _check_port_on_node(snode, port_id):
+    try:
+        snode_api = SNodeClient(f"{snode.mgmt_ip}:5000", timeout=3, retry=2)
+        iptables_command_output = snode_api.get_firewall()
+        result = jc.parse('iptables', iptables_command_output)
+        for chain in result:
+            if chain['chain'] in ["INPUT", "OUTPUT"]:
+                for rule in chain['rules']:
+                    if str(port_id) in rule['options']:
+                        action = rule['target']
+                        if action == "DROP":
+                            return False
+
+        return True
+    except Exception as e:
+        logger.debug(e)
+    return True
+
+
 def _check_node_ping(ip):
     res = utils.ping_host(ip)
     if res:

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.51}/simplyblock_core/controllers/pool_controller.py

@@ -129,9 +129,10 @@ def delete_pool(uuid):
         logger.error(f"Pool is disabled")
         return False
 
-    # if pool.lvols:
-    #     logger.error(f"Pool is not empty {uuid}")
-    #     return False
+    lvols = db_controller.get_lvols_by_pool_id(uuid)
+    if lvols and len(lvols) > 0:
+        logger.error(f"Pool {uuid} is not empty, lvols found {len(lvols)}")
+        return False
 
     logger.info(f"Deleting pool {pool.get_id()}")
     pool_events.pool_remove(pool)

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.51}/simplyblock_core/env_var

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

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.51}/simplyblock_core/scripts/install_deps.sh

@@ -37,9 +37,3 @@ sudo chmod 777 /etc/simplyblock
 sudo sh -c 'echo 1 >  /proc/sys/vm/drop_caches'
 
 sudo sed -i 's/ProcessSizeMax=.*/ProcessSizeMax=5G/' /etc/systemd/coredump.conf
-
-sudo iptables -F
-sudo iptables -X
-sudo iptables -P INPUT ACCEPT
-sudo iptables -P FORWARD ACCEPT
-sudo iptables -P OUTPUT ACCEPT

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.51}/simplyblock_core/services/health_check_service.py

@@ -9,6 +9,7 @@ from simplyblock_core.models.nvme_device import NVMeDevice
 from simplyblock_core.models.storage_node import StorageNode
 from simplyblock_core.rpc_client import RPCClient
 from simplyblock_core import constants, db_controller, utils, distr_controller
+from simplyblock_core.snode_client import SNodeClient
 
 logger = utils.get_logger(__name__)
 
@@ -43,6 +44,8 @@ def set_device_health_check(cluster_id, device, health_check_status):
 # get DB controller
 db_controller = db_controller.DBController()
 
+nodes_ports_blocked = {}
+
 logger.info("Starting health check service")
 while True:
     clusters = db_controller.get_clusters()
@@ -286,14 +289,38 @@ while True:
                         if second_node_1 and second_node_1.status == StorageNode.STATUS_ONLINE:
                             lvstore_check &= health_controller._check_node_lvstore(lvstore_stack, second_node_1, auto_fix=True)
 
+                    lvol_port_check = False
+                    if node_api_check:
+                        lvol_port_check = health_controller._check_port_on_node(snode, snode.lvol_subsys_port)
+                        logger.info(
+                            f"Check: node {snode.mgmt_ip}:{snode.rpc_port}, port: {snode.lvol_subsys_port} ... {lvol_port_check}")
+                        if not lvol_port_check:
+                            nodes_ports_blocked[snode.get_id()] = nodes_ports_blocked.get(snode.get_id(), []).append(
+                                snode.lvol_subsys_port)
+
                 if snode.is_secondary_node:
                     for node in db_controller.get_storage_nodes():
                         if node.secondary_node_id == snode.get_id() and node.status == StorageNode.STATUS_ONLINE:
                             logger.info(f"Checking stack from node : {node.get_id()}")
                             lvstore_check &= health_controller._check_node_lvstore(node.lvstore_stack, snode, auto_fix=True)
+                            lvol_port_check = False
+                            if node_api_check:
+                                lvol_port_check = health_controller._check_port_on_node(snode, node.lvol_subsys_port)
+                                logger.info(
+                                    f"Check: node {snode.mgmt_ip}:{snode.rpc_port}, port: {node.lvol_subsys_port} ... {lvol_port_check}")
+                                if not lvol_port_check:
+                                    nodes_ports_blocked[snode.get_id()] = nodes_ports_blocked.get(snode.get_id(), []).append(node.lvol_subsys_port)
 
                 health_check_status = is_node_online and node_devices_check and node_remote_devices_check and lvstore_check
             set_node_health_check(snode, health_check_status)
 
     time.sleep(constants.HEALTH_CHECK_INTERVAL_SEC)
 
+    for node_id, port_lst in nodes_ports_blocked.items():
+        snode = db_controller.get_storage_node_by_id(node_id)
+        snode_api = SNodeClient(f"{snode.mgmt_ip}:5000", timeout=3, retry=2)
+        for port in port_lst:
+            iptables_command_output = snode_api.firewall_set_port(port, "tcp", "allow")
+
+    nodes_ports_blocked = {}
+

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.51}/simplyblock_web/blueprints/snode_ops.py

@@ -155,7 +155,8 @@ def spdk_process_start():
     spdk_image = constants.SIMPLY_BLOCK_SPDK_ULTRA_IMAGE
     if 'spdk_image' in data and data['spdk_image']:
         spdk_image = data['spdk_image']
-        # node_docker.images.pull(spdk_image)
+
+    node_docker.images.pull(spdk_image)
 
     if "cluster_ip" in data and data['cluster_ip']:
         cluster_ip = data['cluster_ip']

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.51}/simplyblock_web/blueprints/web_api_pool.py

@@ -103,8 +103,11 @@ def delete_pool(uuid):
         if req_secret != pool.secret:
             return utils.get_response_error(f"Pool secret doesn't mach the value in the request header", 400)
 
-    # if pool.lvols:
-    #     return utils.get_response_error(f"Can not delete Pool with LVols", 400)
+    lvols = db_controller.get_lvols_by_pool_id(uuid)
+    if lvols and len(lvols) > 0:
+        msg = f"Pool {uuid} is not empty, lvols found {len(lvols)}"
+        logger.error(msg)
+        return utils.get_response_error(msg, 400)
 
     pool.remove(db_controller.kv_store)
     return utils.get_response("Done")