Skip to content

Commit e625b97

Browse files
committed
MB-47702: Optionally register node with epmd.
Do not crash if fail to register with epmd, we might have killed it. Change-Id: Ia6abb52fd34c361e3168a2907c5f049abb4e890d Reviewed-on: http://review.couchbase.org/c/ns_server/+/158664 Well-Formed: Build Bot <[email protected]> Tested-by: Abhijeeth Nuthan <[email protected]> Reviewed-by: Timofey Barmin <[email protected]>
1 parent 19f6192 commit e625b97

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

src/cb_dist.erl

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -597,10 +597,8 @@ listen_proto({AddrType, Module}, NodeName) ->
597597
fun () ->
598598
case Module:listen(NodeName) of
599599
{ok, _} = Res ->
600-
case maybe_register_on_epmd(Module, NodeName, Port) of
601-
ok -> Res;
602-
{error, _} = Error -> Error
603-
end;
600+
maybe_register_on_epmd(Module, NodeName, Port),
601+
Res;
604602
Error -> Error
605603
end
606604
end,
@@ -636,9 +634,14 @@ maybe_register_on_epmd(Module, NodeName, PortNo)
636634
ns_server ->
637635
Family = proto_to_family(Module),
638636
case erl_epmd:register_node(NameStr, PortNo, Family) of
639-
{ok, _} -> ok;
640-
{error, already_registered} -> ok;
641-
Error -> Error
637+
{ok, _} ->
638+
ok;
639+
{error, already_registered} ->
640+
ok;
641+
Error ->
642+
info_msg("Failed to register ~p with epmd. Reason ~p",
643+
[{NodeName, PortNo, Family}, Error]),
644+
Error
642645
end;
643646
_ ->
644647
ok

0 commit comments

Comments
 (0)