Skip to content

Commit 36eb6ca

Browse files
committed
Update spec, noconnection is also a possible error
1 parent cdeabe2 commit 36eb6ca

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

deps/rabbit/src/rabbit_db_cluster.erl

+6-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ ensure_feature_flags_are_in_sync(Nodes, NodeIsVirgin) ->
5050
RemoteNode :: node(),
5151
Ret :: Ok | Error,
5252
Ok :: {ok, [node()]} | {ok, already_member},
53-
Error :: {error, {inconsistent_cluster, string()}}.
53+
Error :: {error, {inconsistent_cluster, string()} | {error, {erpc, noconnection}}}.
5454

5555
can_join(RemoteNode) ->
5656
?LOG_INFO(
@@ -82,7 +82,7 @@ can_join_using_khepri(RemoteNode) ->
8282
NodeType :: node_type(),
8383
Ret :: Ok | Error,
8484
Ok :: ok | {ok, already_member},
85-
Error :: {error, {inconsistent_cluster, string()}}.
85+
Error :: {error, {inconsistent_cluster, string()} | {error, {erpc, noconnection}}}.
8686
%% @doc Adds this node to a cluster using `RemoteNode' to reach it.
8787

8888
join(ThisNode, _NodeType) when ThisNode =:= node() ->
@@ -214,7 +214,7 @@ join(RemoteNode, NodeType)
214214
end;
215215
{ok, already_member} ->
216216
{ok, already_member};
217-
{error, {inconsistent_cluster, Msg}} = Error ->
217+
{error, {inconsistent_cluster, _Msg}} = Error ->
218218
case rabbit_khepri:is_enabled() of
219219
true ->
220220
Error;
@@ -229,7 +229,9 @@ join(RemoteNode, NodeType)
229229
[RemoteNode, node(), node(), node()]),
230230
ok = rabbit_mnesia:leave_discover_cluster(RemoteNode),
231231
join(RemoteNode, NodeType)
232-
end
232+
end;
233+
{error, _} = Error ->
234+
Error
233235
end.
234236

235237
join_using_mnesia(ClusterNodes, NodeType) when is_list(ClusterNodes) ->

deps/rabbit/src/rabbit_mnesia.erl

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ init() ->
155155
%% we cluster to its cluster.
156156

157157
-spec can_join_cluster(node())
158-
-> {ok, [node()]} | {ok, already_member} | {error, {inconsistent_cluster, string()}}.
158+
-> {ok, [node()]} | {ok, already_member} | {error, {inconsistent_cluster, string()} | {error, {erpc, noconnection}}}.
159159

160160
can_join_cluster(DiscoveryNode) ->
161161
ensure_mnesia_dir(),

0 commit comments

Comments
 (0)