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

Jump to bottom

Shuffle the config loading to make it available earlier #310

Merged
merged 1 commit into from
Feb 1, 2021
Merged

Shuffle the config loading to make it available earlier #310

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
48 changes: 17 additions & 31 deletions src/ergw.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@
-behavior(gen_server).

%% API
-export([start_link/0]).
-export([start_link/1]).
-export([start_socket/1, start_ip_pool/2,
connect_sx_node/2,
attach_tdf/2, attach_protocol/5]).
-export([handler/2]).
-export([load_config/1]).
-export([get_plmn_id/0, get_node_id/0, get_accept_new/0]).
-export([system_info/0, system_info/1, system_info/2]).
-export([i/0, i/1, i/2]).

-ignore_xref([start_link/0, i/0, i/1, i/2]).
-ignore_xref([start_link/1, i/0, i/1, i/2]).

%% gen_server callbacks
-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
Expand All @@ -39,8 +38,8 @@
%% API
%%====================================================================

start_link() ->
gen_server:start_link(?MODULE, [], []).
start_link(Config) ->
gen_server:start_link(?MODULE, [Config], []).

%% get global PLMN Id (aka MCC/MNC)
get_plmn_id() ->
Expand Down Expand Up @@ -72,29 +71,6 @@ system_info(accept_new, New) when is_boolean(New) ->
system_info(Key, Value) ->
error(badarg, [Key, Value]).

load_config([]) ->
ok;
load_config([{plmn_id, {MCC, MNC}} | T]) ->
true = ets:insert(?SERVER, {config, plmn_id, MCC, MNC}),
load_config(T);
load_config([{accept_new, Value} | T]) ->
true = ets:insert(?SERVER, {config, accept_new, Value}),
load_config(T);
load_config([{Key, Value} | T])
when Key =:= path_management;
Key =:= node_selection;
Key =:= nodes;
Key =:= ip_pools;
Key =:= apns;
Key =:= charging;
Key =:= proxy_map;
Key =:= teid;
Key =:= node_id ->
ok = application:set_env(ergw, Key, Value),
load_config(T);
load_config([_ | T]) ->
load_config(T).

%%
%% Initialize a new PFCP, GTPv1/v2-c or GTPv1-u socket
%%
Expand Down Expand Up @@ -222,11 +198,10 @@ i(memory, context) ->
%%% gen_server callbacks
%%%===================================================================

init([]) ->
init([Config]) ->
TID = ets:new(?SERVER, [ordered_set, named_table, public,
{keypos, 2}, {read_concurrency, true}]),
true = ets:insert(TID, {config, plmn_id, <<"001">>, <<"01">>}),
true = ets:insert(TID, {config, accpept_new, true}),
load_config(Config),
{ok, #state{tid = TID}}.

handle_call(_Request, _From, State) ->
Expand All @@ -248,3 +223,14 @@ code_change(_OldVsn, State, _Extra) ->
%%%===================================================================
%%% Internal functions
%%%===================================================================

load_config([]) ->
ok;
load_config([{plmn_id, {MCC, MNC}} | T]) ->
true = ets:insert(?SERVER, {config, plmn_id, MCC, MNC}),
load_config(T);
load_config([{accept_new, Value} | T]) ->
true = ets:insert(?SERVER, {config, accept_new, Value}),
load_config(T);
load_config([_ | T]) ->
load_config(T).
6 changes: 3 additions & 3 deletions src/ergw_app.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@

start(_StartType, _StartArgs) ->
do([error_m ||
gtp_config:init(),
Config <- ergw_config:load(),
ergw_prometheus:declare(),
ensure_jobs_queues(),
Pid <- ergw_sup:start_link(),
ergw_config:load_config(setup:get_all_env(ergw)),
Pid <- ergw_sup:start_link(Config),
ergw_config:apply(Config),
return(Pid)
]).

Expand Down
30 changes: 26 additions & 4 deletions src/ergw_config.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
-compile({parse_transform, cut}).

%% API
-export([load_config/1,
-export([load/0,
apply/1,
validate_options/4,
validate_apn_name/1,
check_unique_keys/2,
Expand Down Expand Up @@ -61,9 +62,30 @@
%%% API
%%%===================================================================

load_config(Config0) ->
Config = validate_config(Config0),
ergw:load_config(Config),
load() ->
Config = validate_config(setup:get_all_env(ergw)),
load_env_config(Config),
ok = gtp_config:init(),
{ok, Config}.

load_env_config([]) ->
ok;
load_env_config([{Key, Value} | T])
when Key =:= path_management;
Key =:= node_selection;
Key =:= nodes;
Key =:= ip_pools;
Key =:= apns;
Key =:= charging;
Key =:= proxy_map;
Key =:= teid;
Key =:= node_id ->
ok = application:set_env(ergw, Key, Value),
load_env_config(T);
load_env_config([_ | T]) ->
load_env_config(T).

apply(Config) ->
lists:foreach(fun ergw:start_socket/1, proplists:get_value(sockets, Config)),
maps:map(fun load_sx_node/2, proplists:get_value(nodes, Config)),
lists:foreach(fun load_handler/1, proplists:get_value(handlers, Config)),
Expand Down
10 changes: 5 additions & 5 deletions src/ergw_sup.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
-behaviour(supervisor).

%% API
-export([start_link/0]).
-export([start_link/1]).

%% Supervisor callbacks
-export([init/1]).
Expand All @@ -22,14 +22,14 @@
%% API functions
%% ===================================================================

start_link() ->
supervisor:start_link({local, ?MODULE}, ?MODULE, []).
start_link(Config) ->
supervisor:start_link({local, ?MODULE}, ?MODULE, [Config]).

%% ===================================================================
%% Supervisor callbacks
%% ===================================================================

init([]) ->
init([Config]) ->
ok = ergw_node_selection_cache:init(),
{ok, {{one_for_one, 5, 10}, [?CHILD(gtp_path_reg, worker, []),
?CHILD(ergw_tei_mngr, worker, []),
Expand All @@ -44,5 +44,5 @@ init([]) ->
?CHILD(ergw_sx_node_mngr, worker, []),
?CHILD(gtp_proxy_ds, worker, []),
?CHILD(ergw_ip_pool_sup, supervisor, []),
?CHILD(ergw, worker, [])
?CHILD(ergw, worker, [Config])
]} }.
13 changes: 10 additions & 3 deletions test/gtp_proxy_ds_SUITE.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,16 @@ init_per_suite(Config) ->
{[<<"apn2">>], [<<"example2">>, <<"com">>]}
]}
],
{ok, Pid} = gen_server:start(ergw, [], []),
ergw:load_config([{plmn_id, {<<"001">>, <<"01">>}},
{proxy_map, ProxyMap}]),
Cfg = [{plmn_id, {<<"001">>, <<"01">>}},
{proxy_map, ProxyMap},
{sockets, []},
{handlers, []},
{ip_pools, #{}},
{nodes, #{}}
],
application:load(ergw),
[application:set_env(ergw, K, V) || {K, V} <- Cfg],
{ok, Pid} = gen_server:start(ergw, [Cfg], []),
gen_server:start({local, gtp_proxy_ds_test}, gtp_proxy_ds, [], []),
[{ergw, Pid}|Config].

Expand Down