Skip to content

Commit f3f89da

Browse files
committed
join
1 parent 48ca935 commit f3f89da

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

deps/rabbit/src/rabbit_db_cluster.erl

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -197,18 +197,18 @@ join(RemoteNode, NodeType)
197197
%% particular, we stop Mnesia regardless of the remotely selected
198198
%% database because we might change it during the join.
199199
% RestartMnesia = rabbit_mnesia:is_running(),
200-
% RestartFFCtl = rabbit_ff_controller:is_running(),
200+
RestartFFCtl = rabbit_ff_controller:is_running(),
201201
RestartRabbit = rabbit:is_running(),
202202
case RestartRabbit of
203203
true ->
204204
rabbit:stop();
205205
false ->
206-
% case RestartFFCtl of
207-
% true ->
208-
% ok = rabbit_ff_controller:wait_for_task_and_stop();
209-
% false ->
210-
% ok
211-
% end,
206+
case RestartFFCtl of
207+
true ->
208+
ok = rabbit_ff_controller:wait_for_task_and_stop();
209+
false ->
210+
ok
211+
end,
212212
% case RestartMnesia of
213213
% true -> rabbit_mnesia:stop_mnesia();
214214
% false -> ok
@@ -280,12 +280,12 @@ join(RemoteNode, NodeType)
280280
true ->
281281
rabbit:start();
282282
false ->
283-
% case RestartFFCtl of
284-
% true ->
285-
% ok = rabbit_sup:start_child(rabbit_ff_controller);
286-
% false ->
287-
% ok
288-
% end,
283+
case RestartFFCtl of
284+
true ->
285+
ok = rabbit_sup:start_child(rabbit_ff_controller);
286+
false ->
287+
ok
288+
end,
289289
% NeedMnesia = not rabbit_khepri:is_enabled(),
290290
% case RestartMnesia andalso NeedMnesia of
291291
% true -> rabbit_mnesia:start_mnesia(false);

0 commit comments

Comments
 (0)