Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(autocluster): avoid stopping autocluster too eagerly #242

Merged
merged 2 commits into from
Dec 20, 2024
Merged

fix(autocluster): avoid stopping autocluster too eagerly #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
388aff1
fix(autocluster): avoid stopping autocluster too eagerly
keynslug Dec 19, 2024
b7ef3f0
chore: update appup instructions
keynslug Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions src/ekka.appup.src
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,59 @@
%% -*- mode: erlang -*-
%% Unless you know what you are doing, DO NOT edit manually!!
{VSN,
[{"0.8.1.13", []},
[{"0.8.1.14",
[{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]}]},
{"0.8.1.13",
[{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]}]},
{"0.8.1.12",
[{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
[{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]}]},
{"0.8.1.11",
[{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]}]},
{"0.8.1.10",
[{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_dist,brutal_purge,soft_purge,[]},
{load_module,ekka_mnesia,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]}]},
{"0.8.1.9",
[{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_mnesia,brutal_purge,soft_purge,[]},
{load_module,ekka_dist,brutal_purge,soft_purge,[]}]},
{"0.8.1.8",
[{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_mnesia,brutal_purge,soft_purge,[]},
{load_module,ekka_dist,brutal_purge,soft_purge,[]}]},
{"0.8.1.7",
[{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_locker,brutal_purge,soft_purge,[]},
{load_module,ekka_mnesia,brutal_purge,soft_purge,[]},
{load_module,ekka_dist,brutal_purge,soft_purge,[]}]},
{<<"0\\.8\\.1\\.[3-6]">>,
[{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]},
Expand All @@ -50,6 +63,7 @@
{load_module,ekka_dist,brutal_purge,soft_purge,[]}]},
{"0.8.1.2",
[{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_ring,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_dns,brutal_purge,soft_purge,[]},
{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
Expand All @@ -62,6 +76,7 @@
{"0.8.1.1",
[{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_dns,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_ring,brutal_purge,soft_purge,[]},
{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_httpc,brutal_purge,soft_purge,[]},
Expand All @@ -73,6 +88,7 @@
{"0.8.1",
[{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_dns,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_ring,brutal_purge,soft_purge,[]},
{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
Expand All @@ -81,46 +97,59 @@
{load_module,ekka_httpc,brutal_purge,soft_purge,[]},
{load_module,ekka_mnesia,brutal_purge,soft_purge,[]},
{load_module,ekka_dist,brutal_purge,soft_purge,[]}]}],
[{"0.8.1.13", []},
[{"0.8.1.14",
[{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]}]},
{"0.8.1.13",
[{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]}]},
{"0.8.1.12",
[{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
[{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]}]},
{"0.8.1.11",
[{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]}]},
{"0.8.1.10",
[{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_dist,brutal_purge,soft_purge,[]},
{load_module,ekka_mnesia,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]}]},
{"0.8.1.9",
[{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_mnesia,brutal_purge,soft_purge,[]},
{load_module,ekka_dist,brutal_purge,soft_purge,[]}]},
{"0.8.1.8",
[{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_mnesia,brutal_purge,soft_purge,[]},
{load_module,ekka_dist,brutal_purge,soft_purge,[]}]},
{"0.8.1.7",
[{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_locker,brutal_purge,soft_purge,[]},
{load_module,ekka_mnesia,brutal_purge,soft_purge,[]},
{load_module,ekka_dist,brutal_purge,soft_purge,[]}]},
{<<"0\\.8\\.1\\.[3-6]">>,
[{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
{load_module,ekka_autoheal,brutal_purge,soft_purge,[]},
Expand All @@ -130,6 +159,7 @@
{load_module,ekka_dist,brutal_purge,soft_purge,[]}]},
{"0.8.1.2",
[{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_ring,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_dns,brutal_purge,soft_purge,[]},
{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
Expand All @@ -142,6 +172,7 @@
{"0.8.1.1",
[{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_dns,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_ring,brutal_purge,soft_purge,[]},
{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_httpc,brutal_purge,soft_purge,[]},
Expand All @@ -153,6 +184,7 @@
{"0.8.1",
[{load_module,ekka_cluster_strategy,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_dns,brutal_purge,soft_purge,[]},
{load_module,ekka_cluster_static,brutal_purge,soft_purge,[]},
{load_module,ekka_ring,brutal_purge,soft_purge,[]},
{load_module,ekka_node_monitor,brutal_purge,soft_purge,[]},
{load_module,ekka_autocluster,brutal_purge,soft_purge,[]},
Expand Down
17 changes: 8 additions & 9 deletions src/ekka_autocluster.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,9 @@ strategy_module(Strategy) ->
discover_and_join(Mod, Options) ->
?tp(ekka_autocluster_discover_and_join, #{mod => Mod}),
try ekka_cluster_strategy:discover(Mod, Options) of
{ok, []} ->
?LOG(info, "Discovery result is empty", []),
error;
{ok, Nodes} ->
{AliveNodes, DeadNodes} = lists:partition(
fun ekka_node:is_aliving/1,
Expand Down Expand Up @@ -202,8 +205,6 @@ discover_and_join(Mod, Options) ->
end.

-spec maybe_join([node()]) -> ignore | ok | {error, _}.
maybe_join([]) ->
ignore;
maybe_join(Nodes0) ->
Nodes = lists:usort(Nodes0),
KnownNodes = lists:usort(ekka_mnesia:cluster_nodes(all)),
Expand All @@ -212,16 +213,13 @@ maybe_join(Nodes0) ->
?LOG(info, "all discovered nodes already in cluster; ignoring", []),
ignore;
false ->
OldestNode = find_oldest_node(Nodes),
?LOG(info, "joining with ~p", [OldestNode]),
join_with(OldestNode)
join_with(find_oldest_node(Nodes -- [node()]))
end.

join_with(false) ->
ignore;
join_with(Node) when Node =:= node() ->
ignore;
{error, no_member};
join_with(Node) ->
?LOG(info, "joining with ~p", [Node]),
ekka_cluster:join(Node).

find_oldest_node([Node]) ->
Expand All @@ -241,4 +239,5 @@ find_oldest_node(Nodes) ->

log_error(Format, {error, Reason}) ->
?LOG(error, Format ++ " error: ~p", [Reason]);
log_error(_Format, _Ok) -> ok.
log_error(_Format, _Ok) ->
ok.
2 changes: 1 addition & 1 deletion src/ekka_cluster_static.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
]).

discover(Options) ->
{ok, proplists:get_value(seeds, Options, [])}.
{ok, proplists:get_value(seeds, Options, [node()])}.

lock(_Options) ->
ignore.
Expand Down
20 changes: 20 additions & 0 deletions test/ekka_autocluster_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,26 @@ t_autocluster_via_dns(_Config) ->
ok = ekka_ct:stop_slave(N1)
end.

t_autocluster_via_dns_laggy(_Config) ->
N1 = ekka_ct:start_slave(ekka, n1),
?check_trace(
#{timetrap => 15000},
try
ok = ekka_ct:wait_running(N1),
ok = set_app_env(N1, {dns, [{name, "thishostnameshouldnotexist"},
{app, "ct"}
]}),
{ok, {ok, #{}}} = ?wait_async_action(
rpc:call(N1, ekka, autocluster, []),
#{?snk_kind := ekka_maybe_run_app_again}),
ok = set_app_env(N1, {dns, ?DNS_OPTIONS}),
ok = wait_for_node(N1),
ok = ekka:force_leave(N1)
after
ok = ekka_ct:stop_slave(N1)
end,
[]).

%%--------------------------------------------------------------------
%% Autocluster via 'etcd' strategy

Expand Down
Loading