Dev: utils: Raise UnreachableNodeError while detecting unreachable nodes

Author: liangxin1300

crmsh/bootstrap.py

@@ -2400,7 +2400,7 @@ def bootstrap_join(context):
             _context.initialize_user()
 
         remote_user, cluster_node = _parse_user_at_host(_context.cluster_node, _context.current_user)
-        utils.node_reachable_check(cluster_node)
+        utils.node_reachable_check(cluster_node, only_ping=True)
         join_ssh(cluster_node, remote_user)
         remote_user = utils.user_of(cluster_node)
 

crmsh/utils.py

@@ -2420,12 +2420,12 @@ def package_is_installed(pkg, remote_addr=None):
     return rc == 0
 
 
-def node_reachable_check(node, ping_count=1, port=22, timeout=3):
+def node_reachable_check(node, ping_count=1, port=22, timeout=3, only_ping=False):
     """
     Check if node is reachable by using ping and socket to ssh port
     """
     rc, _, _ = ShellUtils().get_stdout_stderr(f"ping -n -c {ping_count} -W {timeout} {node}")
-    if rc == 0:
+    if rc == 0 and only_ping:
         return True
     # ping failed, try to connect to ssh port by socket
     if check_port_open(node, port, timeout):
@@ -2466,6 +2466,12 @@ def __init__(self, msg: str, dead_nodes=None):
         self.dead_nodes = dead_nodes or []
 
 
+class UnreachableNodeError(ValueError):
+    def __init__(self, msg: str, unreachable_nodes=None):
+        super().__init__(msg)
+        self.unreachable_nodes = unreachable_nodes or []
+
+
 def check_all_nodes_reachable(action_to_do: str, peer_node: str = None):
     """
     Check if all cluster nodes are reachable
@@ -2487,8 +2493,17 @@ def check_all_nodes_reachable(action_to_do: str, peer_node: str = None):
         """
         raise DeadNodeError(msg, dead_nodes)
 
+    unreachable_nodes = []
     for node in online_nodes:
-        node_reachable_check(node)
+        try:
+            node_reachable_check(node)
+        except ValueError:
+            unreachable_nodes.append(node)
+    if unreachable_nodes:
+        msg = f"""There are nodes unreachable: {', '.join(unreachable_nodes)}.
+Please check the network connectivity before {action_to_do}.
+        """
+        raise UnreachableNodeError(msg, unreachable_nodes)
 
 
 def re_split_string(reg, string):