yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(emqx_cluster_rpc): do not log throw stacktrace 

also not logging the call arguments as it may containe sensitive info
This commit is contained in:
Zaiming (Stone) Shi 2022-02-08 18:52:51 +01:00
parent a86b684535
commit 49d3163471
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
apps/emqx_conf/src/emqx_cluster_rpc.erl
View File

@ -228,7 +228,7 @@ catch_up(#{node := Node, retry_interval := RetryMs} = State, SkipResult) ->
{atomic, ok} -> catch_up(State, false); {atomic, ok} -> catch_up(State, false);
Error -> Error ->
?SLOG(error, #{ ?SLOG(error, #{
msg => "failed to commit applied call", msg => "failed_to_commit_applied_call",
applied_id => NextId, applied_id => NextId,
error => Error}), error => Error}),
RetryMs RetryMs
@ -359,28 +359,34 @@ apply_mfa(TnxId, {M, F, A}) ->
Res = Res =
try erlang:apply(M, F, A) try erlang:apply(M, F, A)
catch catch
Class:Reason:Stacktrace -> throw : Reason ->
{error, #{reason => Reason}};
Class : Reason : Stacktrace ->
{error, #{exception => Class, reason => Reason, stacktrace => Stacktrace}} {error, #{exception => Class, reason => Reason, stacktrace => Stacktrace}}
end, end,
Meta = #{tnx_id => TnxId, module => M, function => F, args => ?TO_BIN(A)}, %% Do not log args as it might be sensitive information
Meta = #{tnx_id => TnxId, entrypoint => format_mfa(M, F, length(A))},
IsSuccess = is_success(Res), IsSuccess = is_success(Res),
log_and_alarm(IsSuccess, Res, Meta, TnxId), log_and_alarm(IsSuccess, Res, Meta),
{IsSuccess, Res}. {IsSuccess, Res}.
format_mfa(M, F, A) ->
iolist_to_binary([atom_to_list(M), ":", atom_to_list(F), "/", integer_to_list(A)]).
is_success(ok) -> true; is_success(ok) -> true;
is_success({ok, _}) -> true; is_success({ok, _}) -> true;
is_success(_) -> false. is_success(_) -> false.
log_and_alarm(true, Res, Meta, TnxId) -> log_and_alarm(true, Res, Meta) ->
OkMeta = Meta#{msg => <<"succeeded to apply MFA">>, result => Res}, ?SLOG(debug, Meta#{msg => "cluster_rpc_apply_ok", result => Res}),
?SLOG(debug, OkMeta), do_alarm(deactivate, Res, Meta);
Message = ["cluster_rpc_apply_failed:", integer_to_binary(TnxId)], log_and_alarm(false, Res, Meta) ->
emqx_alarm:deactivate(cluster_rpc_apply_failed, OkMeta#{result => ?TO_BIN(Res)}, Message); ?SLOG(error, Meta#{msg => "cluster_rpc_apply_failed", result => Res}),
log_and_alarm(false, Res, Meta, TnxId) -> do_alarm(activate, Res, Meta).
NotOkMeta = Meta#{msg => <<"failed to apply MFA">>, result => Res},
?SLOG(error, NotOkMeta), do_alarm(Fun, Res, #{tnx_id := Id} = Meta) ->
Message = ["cluster_rpc_apply_failed:", integer_to_binary(TnxId)], AlarmMsg = ["cluster_rpc_apply_failed=", integer_to_list(Id)],
emqx_alarm:activate(cluster_rpc_apply_failed, NotOkMeta#{result => ?TO_BIN(Res)}, Message). emqx_alarm:Fun(cluster_rpc_apply_failed, Meta#{result => ?TO_BIN(Res)}, AlarmMsg).
wait_for_all_nodes_commit(TnxId, Delay, Remain) -> wait_for_all_nodes_commit(TnxId, Delay, Remain) ->
case lagging_node(TnxId) of case lagging_node(TnxId) of