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

feat(rule_engine_metics): add hot upgrade feat

This commit is contained in:
EMQ-YangM 2022-01-06 00:47:17 -08:00
parent 2074dd63f9
commit be81c65eda
1 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
apps/emqx_rule_engine/src/emqx_rule_metrics.erl
View File

@ -349,43 +349,55 @@ handle_info(_Info, State) ->
{noreply, State}. {noreply, State}.
code_change({down, Vsn}, State = #state{metric_ids = MIDs}, _Extra) code_change({down, Vsn}, State = #state{metric_ids = MIDs}, _Extra)
when Vsn =:= "4.2.0"; when Vsn =:= "4.3.0";
Vsn =:= "4.2.1" -> Vsn =:= "4.3.1";
emqx_metrics:ensure('actions.failure'), Vsn =:= "4.3.2";
emqx_metrics:set('actions.failure', Vsn =:= "4.3.3";
emqx_metrics:val('actions.error') Vsn =:= "4.3.4";
+ emqx_metrics:val('actions.exception')), Vsn =:= "4.3.5";
Vsn =:= "4.3.6" ->
[begin [begin
Matched = get_rules_matched(Id), Passed = get_rules_passed(Id),
Succ = get_actions_success(Id), Take = get_actions_taken(Id),
Success = get_actions_success(Id),
Error = get_actions_error(Id), Error = get_actions_error(Id),
Except = get_actions_exception(Id), Exception = get_actions_exception(Id),
Retry = get_actions_retry(Id),
ok = delete_counters(Id), ok = delete_counters(Id),
ok = create_counters(Id), ok = create_counters(Id, 7),
inc_rules_matched(Id, Matched), inc_rules_matched(Id, Passed),
inc_actions_success(Id, Succ), inc_actions_taken(Id, Take),
inc_actions_error(Id, Error + Except) inc_actions_success(Id, Success),
inc_actions_error(Id, Error),
inc_actions_exception(Id, Exception),
inc_actions_retry(Id, Retry)
end || Id <- sets:to_list(MIDs)], end || Id <- sets:to_list(MIDs)],
{ok, State}; {ok, State};
code_change(Vsn, State = #state{metric_ids = MIDs}, _Extra) code_change(Vsn, State = #state{metric_ids = MIDs}, _Extra)
when Vsn =:= "4.2.0"; when Vsn =:= "4.3.0";
Vsn =:= "4.2.1" -> Vsn =:= "4.3.1";
[emqx_metrics:ensure(Name) Vsn =:= "4.3.2";
|| Name <- Vsn =:= "4.3.3";
['actions.error', 'actions.taken', Vsn =:= "4.3.4";
'actions.exception', 'actions.retry' Vsn =:= "4.3.5";
]], Vsn =:= "4.3.6" ->
emqx_metrics:set('actions.error', emqx_metrics:val('actions.failure')),
[begin [begin
Matched = get_rules_matched(Id), Matched = get_rules_matched(Id),
Succ = get_actions_success(Id), Take = get_actions_taken(Id),
Success = get_actions_success(Id),
Error = get_actions_error(Id), Error = get_actions_error(Id),
Exception = get_actions_exception(Id),
Retry = get_actions_retry(Id),
ok = delete_counters(Id), ok = delete_counters(Id),
ok = create_counters(Id), ok = create_counters(Id),
inc_rules_matched(Id, Matched), inc_rules_matched(Id, Matched),
inc_actions_success(Id, Succ), inc_rules_passed(Id, Matched),
inc_actions_error(Id, Error) inc_actions_taken(Id, Take),
inc_actions_success(Id, Success),
inc_actions_error(Id, Error),
inc_actions_exception(Id, Exception),
inc_actions_retry(Id, Retry)
end || Id <- sets:to_list(MIDs)], end || Id <- sets:to_list(MIDs)],
{ok, State}; {ok, State};
@ -407,10 +419,12 @@ async_refresh_resource_status() ->
spawn(emqx_rule_engine, refresh_resource_status, []). spawn(emqx_rule_engine, refresh_resource_status, []).
create_counters(Id) -> create_counters(Id) ->
create_counters(Id, max_counters_size()).
create_counters(Id, Size) ->
case couters_ref(Id) of case couters_ref(Id) of
not_found -> not_found ->
ok = persistent_term:put(?CRefID(Id), ok = persistent_term:put(?CRefID(Id),
counters:new(max_counters_size(), [write_concurrency])); counters:new(Size, [write_concurrency]));
_Ref -> ok _Ref -> ok
end. end.
@ -468,12 +482,12 @@ precision(Float, N) ->
max_counters_size() -> 11. max_counters_size() -> 11.
metrics_idx('actions.success') -> 1; metrics_idx('rules.matched') -> 1;
metrics_idx('actions.error') -> 2; metrics_idx('actions.success') -> 2;
metrics_idx('actions.taken') -> 3; metrics_idx('actions.error') -> 3;
metrics_idx('actions.exception') -> 4; metrics_idx('actions.taken') -> 4;
metrics_idx('actions.retry') -> 5; metrics_idx('actions.exception') -> 5;
metrics_idx('rules.matched') -> 6; metrics_idx('actions.retry') -> 6;
metrics_idx('rules.failed') -> 7; metrics_idx('rules.failed') -> 7;
metrics_idx('rules.passed') -> 8; metrics_idx('rules.passed') -> 8;
metrics_idx('rules.exception') -> 9; metrics_idx('rules.exception') -> 9;
@ -481,12 +495,12 @@ metrics_idx('rules.no_result') -> 10;
metrics_idx(_) -> 11. metrics_idx(_) -> 11.
overall_metrics() -> overall_metrics() ->
[ 'actions.success' [ 'rules.matched'
, 'actions.success'
, 'actions.error' , 'actions.error'
, 'actions.taken' , 'actions.taken'
, 'actions.exception' , 'actions.exception'
, 'actions.retry' , 'actions.retry'
, 'rules.matched'
, 'rules.failed' , 'rules.failed'
, 'rules.passed' , 'rules.passed'
, 'rules.exception' , 'rules.exception'