Skip to content

fix(arweave_config_legacy): timeout during high load #961

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

Closed
humaite wants to merge 1 commit into from
Closed

fix(arweave_config_legacy): timeout during high load #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
150 changes: 73 additions & 77 deletions apps/arweave_config/src/arweave_config_legacy.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
-include("arweave_config.hrl").
-include_lib("kernel/include/logger.hrl").
-include_lib("eunit/include/eunit.hrl").
-record(?MODULE, {proplist, record}).

%%--------------------------------------------------------------------
%% @doc Returns the complete list of all keys from configuration
Expand All @@ -95,21 +94,22 @@ keys() ->
-spec has_key(atom()) -> boolean().

has_key(Key) when is_atom(Key) ->
gen_server:call(?MODULE, {has_key, Key}, 1000).
case lookup(proplist) of
{ok, P} -> proplists:is_defined(Key, P);
_ -> undefined
end.

%%--------------------------------------------------------------------
%% @doc Returns process state configuration as `#config{}' record.
%% @end
%%--------------------------------------------------------------------
-spec get() -> Return when
Return :: undefined | {ok, #config{}}.
Return :: undefined | #config{}.

get() ->
try gen_server:call(?MODULE, get, 1000) of
{ok, Value} -> Value;
case lookup(record) of
{ok, C} -> C;
_Elsewise -> undefined
catch
_E:R:S -> throw({error, {R, S}})
end.

%%--------------------------------------------------------------------
Expand All @@ -121,11 +121,9 @@ get() ->
Return :: undefined | term().

get(Key) when is_atom(Key) ->
try gen_server:call(?MODULE, {get, Key}, 1000) of
{ok, Value} -> Value;
_Elsewise -> undefined
catch
_E:R:S -> throw({error, {R, S}})
case lookup(proplist) of
{ok, P} -> proplists:get_value(Key, P);
_ -> undefined
end.

%%--------------------------------------------------------------------
Expand Down Expand Up @@ -200,7 +198,7 @@ reset() ->
-spec get_env() -> {ok, #config{}}.

get_env() ->
gen_server:call(?MODULE, get_env, 1000).
lookup(record).

%%--------------------------------------------------------------------
%% @doc merge a configuration file (set only modified values).
Expand Down Expand Up @@ -233,16 +231,14 @@ stop() ->
%%--------------------------------------------------------------------
%% @hidden
%%--------------------------------------------------------------------
init(_) ->
init(_Args) ->
?LOG_INFO("start ~p process", [?MODULE]),
Proplist = config_to_proplist(#config{}),
?LOG_DEBUG([{configuration, Proplist}]),
Ets = ets:new(?MODULE, [named_table, protected]),
insert(record, #config{}),
insert(proplist, Proplist),
set_environment(Proplist),
{ok, #?MODULE{
proplist = Proplist,
record = #config{}
}
}.
{ok, Ets}.

%%--------------------------------------------------------------------
%% @hidden
Expand All @@ -254,89 +250,80 @@ terminate(_, _) ->
%%--------------------------------------------------------------------
%% @hidden
%%--------------------------------------------------------------------
handle_call({merge, Config}, _From, State = #?MODULE{ proplist = P })
handle_call({merge, Config}, _From, Ets)
when is_record(Config, config) ->
try
MergedProplist = config_merge(P, Config),
MergedConfig = proplist_to_config(MergedProplist),
NewState = State#?MODULE{
proplist = MergedProplist,
record = MergedConfig
},
{reply, {ok, MergedConfig}, NewState}
try lookup(proplist) of
{ok, P} ->
MergedProplist = config_merge(P, Config),
MergedConfig = proplist_to_config(MergedProplist),
insert(proplist, MergedProplist),
insert(record, MergedConfig),
{reply, {ok, MergedConfig}, Ets}
catch
_Error:Reason ->
{reply, {error, Reason}, State}
{reply, {error, Reason}, Ets}
end;
handle_call({has_key, Key}, _From, State = #?MODULE{ proplist = P }) ->
{reply, proplists:is_defined(Key, P), State};
handle_call(keys, _From, State = #?MODULE{ proplist = P }) ->
{reply, [ K || {K,_} <- P ], State};
handle_call(get, _From, State = #?MODULE{ record = R }) ->
{reply, {ok, R}, State};
handle_call({get, Key}, _From, State = #?MODULE{ proplist = P })
when is_atom(Key) ->
Return = {ok, proplists:get_value(Key, P)},
{reply, Return, State};
handle_call({set, Config}, _From, State)
handle_call(keys, _From, Ets) ->
case lookup(proplist) of
{ok, P} ->
{reply, [ K || {K,_} <- P ], Ets};
{error,_ } ->
{reply, undefined, Ets}
end;
handle_call({set, Config}, _From, Ets)
when is_record(Config, config) ->
try
Proplist = config_to_proplist(Config),
NewState = #?MODULE{
proplist = Proplist,
record = Config
},
insert(proplist, Proplist),
insert(record, Config),
set_environment(Config),
{reply, ok, NewState}
{reply, ok, Ets}
catch
_Error:Reason ->
{reply, {error, Reason}, State}
{reply, {error, Reason}, Ets}
end;
handle_call({set, Key, Value, Opts}, _From, State = #?MODULE{ proplist = P })
handle_call({set, Key, Value, Opts}, _From, Ets)
when is_atom(Key), is_map(Opts) ->
OldValue = proplists:get_value(Key, P),
NewP = lists:keyreplace(Key, 1, P, {Key, Value}),
set_environment(NewP),
Return = {ok, Value, OldValue},
NewState = State#?MODULE{
proplist = NewP,
record = proplist_to_config(NewP)
},
{reply, Return, NewState};
handle_call(get_env, _From, State = #?MODULE{ record = R }) ->
{reply, {ok, R}, State};
handle_call({set_env, Config}, _From, State) ->
case lookup(proplist) of
{ok, P} ->
OldValue = proplists:get_value(Key, P),
NewP = lists:keyreplace(Key, 1, P, {Key, Value}),
set_environment(NewP),
Return = {ok, Value, OldValue},
insert(proplist, NewP),
insert(record, proplist_to_config(NewP)),
{reply, Return, Ets};
{error, Reason} ->
{reply, {error, Reason}, Ets}
end;
handle_call({set_env, Config}, _From, Ets) ->
case import_config(Config) of
{ok, NewP} ->
set_environment(NewP),
NewState = State#?MODULE{
proplist = NewP,
record = proplist_to_config(NewP)
},
{reply, ok, NewState};
insert(proplist, NewP),
insert(record, proplist_to_config(NewP)),
{reply, ok, Ets};
_ ->
{reply, error, State}
{reply, error, Ets}
end;
handle_call(reset, _From, State) ->
handle_call(reset, _From, Ets) ->
case reset_config() of
{ok, NewP} ->
NewState = State#?MODULE{
proplist = NewP,
record = proplist_to_config(NewP)
},
{reply, ok, NewState};
insert(proplist, NewP),
insert(record, proplist_to_config(NewP)),
{reply, ok, Ets};
_ ->
{reply, error, State}
{reply, error, Ets}
end;
handle_call(Message, From, State) ->
handle_call(Message, From, Ets) ->
Error = [
{from, From},
{message, Message},
{from, From},
{pid, self()}
],
?LOG_ERROR(Error),
{reply, {error, Error}, State}.
{reply, {error, Error}, Ets}.

%%--------------------------------------------------------------------
%% @hidden
Expand Down Expand Up @@ -546,7 +533,7 @@ config_merge_test() ->
#config{ init = true }
)
),
#config{ init = Init1 } = Merged1,
#config{ init = Init1 } = Merged1,
?assertEqual(true, Init1),

Merged2 = proplist_to_config(
Expand All @@ -555,5 +542,14 @@ config_merge_test() ->
#config{ init = true }
)
),
#config{ init = Init2 } = Merged2,
#config{ init = Init2 } = Merged2,
?assertEqual(true, Init2).

lookup(Key) ->
case ets:lookup(?MODULE, Key) of
[{Key, Value}] -> {ok, Value};
_ -> {error, undefined}
end.

insert(Key, Value) ->
ets:insert(?MODULE, {Key, Value}).
5 changes: 5 additions & 0 deletions apps/arweave_config/test/arweave_config_legacy_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ all() ->
%% @end
%%--------------------------------------------------------------------
arweave_config_legacy(_Config) ->
ct:pal(test, 1, "simple unsupported handler test"),
_ = gen_server:call(arweave_config_legacy, unsupported),
_ = gen_server:cast(arweave_config_legacy, unsupported),
_ = erlang:send(arweave_config_legacy, unsupported),

ct:pal(test, 1, "config keys should be the same"),
Keys = arweave_config_legacy:keys(),
ConfigKeys = record_info(fields, config),
Expand Down
Loading