Skip to content

Commit

Permalink
Revert dist blocker
Browse files Browse the repository at this point in the history
The dist_blocker feature was introduced to protect disconnected nodes
from reconnecting before other nodes finished their clenaup.

However, when dist_blocker kicks in, multiple unexpected error
messages would appear on several nodes.

This means that the solution cannot be accepted.
  • Loading branch information
chrzaszcz committed Mar 27, 2024
1 parent e284af4 commit 509759e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 deletions.
4 changes: 1 addition & 3 deletions src/ejabberd_sup.erl
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ start_link() ->
supervisor:start_link({local, ?MODULE}, ?MODULE, []).

init([]) ->
DistBlocker = worker_spec(cets_dist_blocker),
Hooks = worker_spec(gen_hook),
Cleaner = worker_spec(mongoose_cleaner),
Router = worker_spec(ejabberd_router),
Expand All @@ -65,8 +64,7 @@ init([]) ->
IQSupervisor =
ejabberd_tmp_sup_spec(ejabberd_iq_sup, [ejabberd_iq_sup, mongoose_iq_worker]),
{ok, {{one_for_one, 10, 1},
[DistBlocker,
StartIdServer,
[StartIdServer,
PG,
Hooks,
Cleaner,
Expand Down
2 changes: 0 additions & 2 deletions src/mongoose_cleaner.erl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ start_link() ->
%%%===================================================================

init([]) ->
cets_dist_blocker:add_cleaner(self()),
case net_kernel:monitor_nodes(true) of
ok ->
{ok, #state{}};
Expand All @@ -57,7 +56,6 @@ handle_info({nodedown, Node}, State) ->
text => <<"mongoose_cleaner received nodenown event">>,
down_node => Node}),
cleanup_modules(Node),
cets_dist_blocker:cleaning_done(self(), Node),
{noreply, State};
handle_info(_Info, State) ->
{noreply, State}.
Expand Down
8 changes: 2 additions & 6 deletions test/mongoose_cleanup_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ opts() ->
{modules, ?HOST} => #{}}.

meck_mods() ->
[exometer, mod_bosh_socket, cets_dist_blocker, mongoose_bin, ejabberd_sm, ejabberd_local].
[exometer, mod_bosh_socket, mongoose_bin, ejabberd_sm, ejabberd_local].

required_modules(muc, Config) ->
required_module(mod_muc, #{online_backend => ?config(backend, Config), backend => mnesia});
Expand Down Expand Up @@ -291,11 +291,7 @@ setup_meck(mongoose_bin) ->
meck:expect(mongoose_bin, gen_from_crypto, fun() -> <<"123456">> end);
setup_meck(mod_bosh_socket) ->
meck:new(mod_bosh_socket, [passthrough, no_link]),
meck:expect(mod_bosh_socket, start_supervisor, fun() -> {ok, self()} end);
setup_meck(cets_dist_blocker) ->
meck:new(cets_dist_blocker, [passthrough, no_link]),
meck:expect(cets_dist_blocker, add_cleaner, fun(_Pid) -> ok end),
meck:expect(cets_dist_blocker, cleaning_done, fun(_Pid, _Node) -> ok end).
meck:expect(mod_bosh_socket, start_supervisor, fun() -> {ok, self()} end).

unload_meck(Module) ->
meck:validate(Module),
Expand Down

0 comments on commit 509759e

Please sign in to comment.