Skip to content

Commit 666d2bc

Browse files
the-mikedavismergify[bot]
authored andcommitted
Move Khepri DB init to rabbit_khepri:init/0
(cherry picked from commit d0da0b5) (cherry picked from commit 950f555)
1 parent dc5fabc commit 666d2bc

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

deps/rabbit/src/rabbit_db.erl

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,10 @@ init_using_mnesia() ->
102102
rabbit_sup:start_child(mnesia_sync).
103103

104104
init_using_khepri() ->
105-
case rabbit_khepri:members() of
106-
[] ->
107-
timer:sleep(1000),
108-
init_using_khepri();
109-
Members ->
110-
?LOG_NOTICE(
111-
"Found the following metadata store members: ~p", [Members],
112-
#{domain => ?RMQLOG_DOMAIN_DB})
113-
end.
105+
?LOG_DEBUG(
106+
"DB: initialize Khepri",
107+
#{domain => ?RMQLOG_DOMAIN_DB}),
108+
rabbit_khepri:init().
114109

115110
init_finished() ->
116111
%% Used during initialisation by rabbit_logger_exchange_h.erl

deps/rabbit/src/rabbit_khepri.erl

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696

9797
-export([setup/0,
9898
setup/1,
99+
init/0,
99100
can_join_cluster/1,
100101
add_member/2,
101102
remove_member/1,
@@ -323,6 +324,23 @@ wait_for_register_projections(Timeout, Retries) ->
323324

324325
%% @private
325326

327+
-spec init() -> Ret when
328+
Ret :: ok.
329+
330+
init() ->
331+
case members() of
332+
[] ->
333+
timer:sleep(1000),
334+
init();
335+
Members ->
336+
?LOG_NOTICE(
337+
"Found the following metadata store members: ~p", [Members],
338+
#{domain => ?RMQLOG_DOMAIN_DB}),
339+
ok
340+
end.
341+
342+
%% @private
343+
326344
can_join_cluster(DiscoveryNode) when is_atom(DiscoveryNode) ->
327345
ThisNode = node(),
328346
try

0 commit comments

Comments
 (0)