Skip to content

Commit 7205f29

Browse files
committed
handle_fallback -> is_enabled
1 parent 93245c2 commit 7205f29

File tree

1 file changed

+20
-26
lines changed

1 file changed

+20
-26
lines changed

deps/rabbit/src/rabbit_db_cluster.erl

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,10 @@ forget_member(Node, RemoveWhenOffline) ->
134134
?LOG_DEBUG(
135135
"DB: removing cluster member `~ts`", [Node],
136136
#{domain => ?RMQLOG_DOMAIN_DB}),
137-
rabbit_khepri:handle_fallback(
138-
#{mnesia => fun() ->
139-
forget_member_using_mnesia(
140-
Node, RemoveWhenOffline)
141-
end,
142-
khepri => fun() ->
143-
forget_member_using_khepri(
144-
Node, RemoveWhenOffline)
145-
end
146-
});
137+
case rabbit_khepri:is_enabled() of
138+
true -> forget_member_using_khepri(Node, RemoveWhenOffline);
139+
false -> forget_member_using_mnesia(Node, RemoveWhenOffline)
140+
end;
147141
true ->
148142
{error, {failed_to_remove_node, Node, rabbit_still_running}}
149143
end.
@@ -172,10 +166,10 @@ forget_member_using_khepri(Node, false = _RemoveWhenOffline) ->
172166

173167
change_node_type(NodeType) ->
174168
rabbit_mnesia:ensure_node_type_is_permitted(NodeType),
175-
rabbit_khepri:handle_fallback(
176-
#{mnesia => fun() -> change_node_type_using_mnesia(NodeType) end,
177-
khepri => ok
178-
}).
169+
case rabbit_khepri:is_enabled() of
170+
true -> ok;
171+
false -> change_node_type_using_mnesia(NodeType)
172+
end.
179173

180174
change_node_type_using_mnesia(NodeType) ->
181175
rabbit_mnesia:change_cluster_node_type(NodeType).
@@ -285,10 +279,10 @@ check_consistency_using_khepri() ->
285279
%% command.
286280

287281
cli_cluster_status() ->
288-
rabbit_khepri:handle_fallback(
289-
#{mnesia => fun cli_cluster_status_using_mnesia/0,
290-
khepri => fun cli_cluster_status_using_khepri/0
291-
}).
282+
case rabbit_khepri:is_enabled() of
283+
true -> cli_cluster_status_using_khepri();
284+
false -> cli_cluster_status_using_mnesia()
285+
end.
292286

293287
cli_cluster_status_using_mnesia() ->
294288
rabbit_mnesia:status().
@@ -297,13 +291,13 @@ cli_cluster_status_using_khepri() ->
297291
rabbit_khepri:cli_cluster_status().
298292

299293
rename(Node, NodeMapList) ->
300-
rabbit_khepri:handle_fallback(
301-
#{mnesia => fun() -> rabbit_mnesia_rename:rename(Node, NodeMapList) end,
302-
khepri => {error, not_supported}
303-
}).
294+
case rabbit_khepri:is_enabled() of
295+
true -> {error, not_supported};
296+
false -> rabbit_mnesia_rename:rename(Node, NodeMapList)
297+
end.
304298

305299
update_cluster_nodes(DiscoveryNode) ->
306-
rabbit_khepri:handle_fallback(
307-
#{mnesia => fun() -> rabbit_mnesia:update_cluster_nodes(DiscoveryNode) end,
308-
khepri => {error, not_supported}
309-
}).
300+
case rabbit_khepri:is_enabled() of
301+
true -> {error, not_supported};
302+
false -> rabbit_mnesia:update_cluster_nodes(DiscoveryNode)
303+
end.

0 commit comments

Comments
 (0)