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

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

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

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

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

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

@@ -106,7 +106,7 @@ def _check_spdk_process_up(ip):
 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()
+        iptables_command_output, _ = snode_api.get_firewall()
         result = jc.parse('iptables', iptables_command_output)
         for chain in result:
             if chain['chain'] in ["INPUT", "OUTPUT"]:
@@ -118,7 +118,7 @@ def _check_port_on_node(snode, port_id):
 
         return True
     except Exception as e:
-        logger.debug(e)
+        logger.error(e)
     return True
 
 
@@ -246,6 +246,12 @@ def check_node(node_id, with_devices=True):
     node_docker_check = _check_node_docker_api(snode.mgmt_ip)
     logger.info(f"Check: node docker API {snode.mgmt_ip}:2375 ... {node_docker_check}")
 
+    lvol_port_check = False
+    if node_api_check:
+        lvol_port_check = _check_port_on_node(snode, snode.lvol_subsys_port)
+        logger.info(
+            f"Check: node {snode.mgmt_ip}, port: {snode.lvol_subsys_port} ... {lvol_port_check}")
+
     is_node_online = ping_check and node_api_check and node_rpc_check and node_docker_check
 
     logger.info(f"Results : {is_node_online}")

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

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

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

@@ -295,8 +295,11 @@ while True:
                         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.get_id() in nodes_ports_blocked:
+                                nodes_ports_blocked[snode.get_id()].append(snode.lvol_subsys_port)
+                            else:
+                                nodes_ports_blocked[snode.get_id()] = [snode.lvol_subsys_port]
+
 
                 if snode.is_secondary_node:
                     for node in db_controller.get_storage_nodes():
@@ -309,18 +312,24 @@ while True:
                                 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)
+                                    if snode.get_id() in nodes_ports_blocked:
+                                        nodes_ports_blocked[snode.get_id()].append(node.lvol_subsys_port)
+                                    else:
+                                        nodes_ports_blocked[snode.get_id()] = [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():
+    for node_id in nodes_ports_blocked:
         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")
+        if nodes_ports_blocked[node_id]:
+            for port in nodes_ports_blocked[node_id]:
+                if port:
+                    logger.info(f"Allow port {port} on node {node_id}")
+                    snode_api.firewall_set_port(port, "tcp", "allow")
 
     nodes_ports_blocked = {}