chore: check ekka proto dist module type when resolving node address

Follow up to emqx#11637 (comment) Fixes https://emqx.atlassian.net/browse/EMQX-10944
thalesmg · Sep 25, 2023 · 806017e · 806017e
1 parent 5e40057
commit 806017e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/apps/emqx_machine/src/emqx_machine.erl b/apps/emqx_machine/src/emqx_machine.erl
@@ -195,7 +195,8 @@ do_check({Node, #{resolved_ips := [IP | _]} = Plan}) ->
 node_to_ips(Node) ->
     NodeBin0 = atom_to_binary(Node),
     HostOrIP = re:replace(NodeBin0, <<"^.+@">>, <<"">>, [{return, list}]),
-    case inet:gethostbyname(HostOrIP, inet) of
+    AddressType = resolve_dist_address_type(),
+    case inet:gethostbyname(HostOrIP, AddressType) of
         {ok, #hostent{h_addr_list = AddrList}} ->
             AddrList;
         _ ->
@@ -210,3 +211,18 @@ is_tcp_port_open(IP, Port) ->
         _ ->
             false
     end.
+
+resolve_dist_address_type() ->
+    ProtoDistStr = os:getenv("EKKA_PROTO_DIST_MOD", "inet_tcp"),
+    case ProtoDistStr of
+        "inet_tcp" ->
+            inet;
+        "inet6_tcp" ->
+            inet6;
+        "inet_tls" ->
+            inet;
+        "inet6_tls" ->
+            inet6;
+        _ ->
+            inet
+    end.
diff --git a/apps/emqx_machine/test/emqx_machine_SUITE.erl b/apps/emqx_machine/test/emqx_machine_SUITE.erl
@@ -170,7 +170,7 @@ t_open_ports_check(Config) ->
                 }
         },
         erpc:call(Core1, emqx_machine, open_ports_check, []),
-        #{core2 => Core2}
+        #{core2 => Core2, gen_rpc_port => GenRPCPort, ekka_port => EkkaPort}
     ),
 
     ok.