fix: alarm crash when safe_publish not ready. Filter out unnecessary APIs

This commit is contained in:
Zhongwen Deng 2022-03-08 14:11:50 +08:00
parent 2d9a086bbb
commit 1244391cb7
5 changed files with 38 additions and 44 deletions

View File

@ -53,6 +53,7 @@
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
-define(ACTIVATED_ALARM, emqx_activated_alarm). -define(ACTIVATED_ALARM, emqx_activated_alarm).
-define(DEACTIVATED_ALARM, emqx_deactivated_alarm). -define(DEACTIVATED_ALARM, emqx_deactivated_alarm).
-define(TRIE, emqx_trie).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Message and Delivery %% Message and Delivery

View File

@ -164,7 +164,7 @@ to_rfc3339(Timestamp) ->
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
init([]) -> init([]) ->
ok = mria:wait_for_tables([?ACTIVATED_ALARM, ?DEACTIVATED_ALARM]), ok = mria:wait_for_tables([?ACTIVATED_ALARM, ?DEACTIVATED_ALARM, ?TRIE]),
deactivate_all_alarms(), deactivate_all_alarms(),
{ok, #{}, get_validity_period()}. {ok, #{}, get_validity_period()}.

View File

@ -47,7 +47,6 @@
-compile(nowarn_export_all). -compile(nowarn_export_all).
-endif. -endif.
-define(TRIE, emqx_trie).
-define(SESSION_DISC_TRIE, emqx_session_trie_disc). -define(SESSION_DISC_TRIE, emqx_session_trie_disc).
-define(SESSION_RAM_TRIE, emqx_session_trie_ram). -define(SESSION_RAM_TRIE, emqx_session_trie_ram).
-define(PREFIX(Prefix), {Prefix, 0}). -define(PREFIX(Prefix), {Prefix, 0}).

View File

@ -30,18 +30,27 @@
-define(PREFIX_RESET, "/configs_reset/"). -define(PREFIX_RESET, "/configs_reset/").
-define(ERR_MSG(MSG), list_to_binary(io_lib:format("~p", [MSG]))). -define(ERR_MSG(MSG), list_to_binary(io_lib:format("~p", [MSG]))).
-define(EXCLUDES, [ -define(EXCLUDES, [
exhook, <<"exhook">>,
gateway, <<"gateway">>,
plugins, <<"plugins">>,
bridges, <<"bridges">>,
"rule_engine", <<"rule_engine">>,
"authorization", <<"authorization">>,
"authentication", <<"authentication">>,
"rpc", <<"rpc">>,
"db", <<"db">>,
"connectors", <<"connectors">>,
"slow_subs", <<"slow_subs">>,
"psk_authentication" <<"psk_authentication">>,
<<"topic_metrics">>,
<<"rewrite">>,
<<"auto_subscribe">>,
<<"retainer">>,
<<"statsd">>,
<<"delayed">>,
<<"event_message">>,
<<"prometheus">>,
<<"telemetry">>
]). ]).
api_spec() -> api_spec() ->
@ -51,7 +60,7 @@ namespace() -> "configuration".
paths() -> paths() ->
["/configs", "/configs_reset/:rootname"] ++ ["/configs", "/configs_reset/:rootname"] ++
lists:map(fun({Name, _Type}) -> ?PREFIX ++ to_list(Name) end, config_list(?EXCLUDES)). lists:map(fun({Name, _Type}) -> ?PREFIX ++ binary_to_list(Name) end, config_list()).
schema("/configs") -> schema("/configs") ->
#{ #{
@ -66,15 +75,12 @@ schema("/configs") ->
desc => desc =>
<<"Node's name: If you do not fill in the fields, this node will be used by default.">>})}], <<"Node's name: If you do not fill in the fields, this node will be used by default.">>})}],
responses => #{ responses => #{
200 => config_list(?EXCLUDES) 200 => lists:map(fun({_, Schema}) -> Schema end, config_list())
} }
} }
}; };
schema("/configs_reset/:rootname") -> schema("/configs_reset/:rootname") ->
Paths = lists:map( Paths = lists:map(fun({Path, _}) -> binary_to_atom(Path) end, config_list()),
fun({Path, _})when is_atom(Path) -> Path;
({Path, _}) when is_list(Path) -> list_to_atom(Path)
end, config_list(?EXCLUDES)),
#{ #{
'operationId' => config_reset, 'operationId' => config_reset,
post => #{ post => #{
@ -88,9 +94,9 @@ schema("/configs_reset/:rootname") ->
%% `conf_path`, it cannot be defined here. %% `conf_path`, it cannot be defined here.
parameters => [ parameters => [
{rootname, hoconsc:mk( hoconsc:enum(Paths) {rootname, hoconsc:mk( hoconsc:enum(Paths)
, #{in => path, example => <<"authorization">>})}, , #{in => path, example => <<"sysmon">>})},
{conf_path, hoconsc:mk(typerefl:binary(), {conf_path, hoconsc:mk(typerefl:binary(),
#{in => query, required => false, example => <<"cache.enable">>, #{in => query, required => false, example => <<"os.sysmem_high_watermark">>,
desc => <<"The config path separated by '.' character">>})}], desc => <<"The config path separated by '.' character">>})}],
responses => #{ responses => #{
200 => <<"Rest config successfully">>, 200 => <<"Rest config successfully">>,
@ -99,13 +105,13 @@ schema("/configs_reset/:rootname") ->
} }
}; };
schema(Path) -> schema(Path) ->
{Root, Schema} = find_schema(Path), {RootKey, {_Root, Schema}} = find_schema(Path),
#{ #{
'operationId' => config, 'operationId' => config,
get => #{ get => #{
tags => [conf], tags => [conf],
description => iolist_to_binary([ <<"Get the sub-configurations under *">> description => iolist_to_binary([ <<"Get the sub-configurations under *">>
, Root , RootKey
, <<"*">>]), , <<"*">>]),
responses => #{ responses => #{
200 => Schema, 200 => Schema,
@ -115,7 +121,7 @@ schema(Path) ->
put => #{ put => #{
tags => [conf], tags => [conf],
description => iolist_to_binary([ <<"Update the sub-configurations under *">> description => iolist_to_binary([ <<"Update the sub-configurations under *">>
, Root , RootKey
, <<"*">>]), , <<"*">>]),
'requestBody' => Schema, 'requestBody' => Schema,
responses => #{ responses => #{
@ -127,13 +133,8 @@ schema(Path) ->
find_schema(Path) -> find_schema(Path) ->
[_, _Prefix, Root | _] = string:split(Path, "/", all), [_, _Prefix, Root | _] = string:split(Path, "/", all),
Configs = config_list(?EXCLUDES), Configs = config_list(),
case lists:keyfind(Root, 1, Configs) of lists:keyfind(list_to_binary(Root), 1, Configs).
{Root, Schema} -> {Root, Schema};
false ->
RootAtom = list_to_existing_atom(Root),
{Root, element(2, lists:keyfind(RootAtom, 1, Configs))}
end.
%% we load all configs from emqx_conf_schema, some of them are defined as local ref %% we load all configs from emqx_conf_schema, some of them are defined as local ref
%% we need redirect to emqx_conf_schema. %% we need redirect to emqx_conf_schema.
@ -148,7 +149,8 @@ config(get, _Params, Req) ->
{ok, Conf} -> {ok, Conf} ->
{200, Conf}; {200, Conf};
{not_found, _, _} -> {not_found, _, _} ->
{404, #{code => 'NOT_FOUND', message => <<"Config cannot found">>}} {404, #{code => 'NOT_FOUND',
message => <<(list_to_binary(Path))/binary, " not found">>}}
end; end;
config(put, #{body := Body}, Req) -> config(put, #{body := Body}, Req) ->
@ -201,13 +203,11 @@ conf_path_from_querystr(Req) ->
Path -> string:lexemes(Path, ". ") Path -> string:lexemes(Path, ". ")
end. end.
config_list(Exclude) -> config_list() ->
Roots = emqx_conf_schema:roots(), Exclude = ?EXCLUDES,
Roots = hocon_schema:roots(emqx_conf_schema),
lists:foldl(fun(Key, Acc) -> lists:keydelete(Key, 1, Acc) end, Roots, Exclude). lists:foldl(fun(Key, Acc) -> lists:keydelete(Key, 1, Acc) end, Roots, Exclude).
to_list(L) when is_list(L) -> L;
to_list(Atom) when is_atom(Atom) -> atom_to_list(Atom).
conf_path(Req) -> conf_path(Req) ->
<<"/api/v5", ?PREFIX, Path/binary>> = cowboy_req:path(Req), <<"/api/v5", ?PREFIX, Path/binary>> = cowboy_req:path(Req),
string:lexemes(Path, "/ "). string:lexemes(Path, "/ ").

View File

@ -27,12 +27,6 @@
-define(EXCEED_LIMIT, 'EXCEED_LIMIT'). -define(EXCEED_LIMIT, 'EXCEED_LIMIT').
-import(emqx_mgmt_util, [ object_array_schema/1
, object_array_schema/2
, error_schema/2
, properties/1
]).
api_spec() -> api_spec() ->
emqx_dashboard_swagger:spec(?MODULE). emqx_dashboard_swagger:spec(?MODULE).