Merge pull request #6686 from k32/bpapi-statsd

fix(emqx_statsd): Decorate RPC calls

apps/emqx_statsd/src/emqx_statsd.erl

@@ -73,10 +73,9 @@ update(Config) ->
             {error, Reason}
     end.
 
-
-start()   -> cluster_call(do_start, []).
-stop()    -> cluster_call(do_stop, []).
-restart() -> cluster_call(do_restart, []).
+start()   -> check_multicall_result(emqx_statsd_proto_v1:start(mria_mnesia:running_nodes())).
+stop()    -> check_multicall_result(emqx_statsd_proto_v1:stop(mria_mnesia:running_nodes())).
+restart() -> check_multicall_result(emqx_statsd_proto_v1:restart(mria_mnesia:running_nodes())).
 
 do_start() ->
     emqx_statsd_sup:ensure_child_started(?APP, emqx_conf:get([statsd], #{})).
@@ -89,19 +88,6 @@ do_restart() ->
     ok = do_start(),
     ok.
 
-cluster_call(F, A) ->
-    [ok = rpc_call(N, F, A) || N <- mria_mnesia:running_nodes()],
-    ok.
-
-rpc_call(N, F, A) ->
-    case rpc:call(N, ?MODULE, F, A, 5000) of
-        {badrpc, R} ->
-            ?LOG(error, "RPC Node: ~p ~p ~p failed, Reason: ~p", [N, ?MODULE, F, R]),
-            {error, {badrpc, R}};
-        Result ->
-            Result
-    end.
-
 start_link(Opts) ->
     gen_server:start_link({local, ?MODULE}, ?MODULE, [Opts], []).
 
@@ -175,3 +161,11 @@ tags(Map) ->
 
 ensure_timer(State =#state{sample_time_interval = SampleTimeInterval}) ->
     State#state{timer = emqx_misc:start_timer(SampleTimeInterval, sample_timeout)}.
+
+check_multicall_result({Results, []}) ->
+    case lists:all(fun(ok) -> true; (_) -> false end, Results) of
+        true  -> ok;
+        false -> error({bad_result, Results})
+    end;
+check_multicall_result({_, _}) ->
+    error(multicall_failed).

apps/emqx_statsd/src/proto/emqx_statsd_proto_v1.erl

@@ -0,0 +1,43 @@
+%%--------------------------------------------------------------------
+%% Copyright (c) 2022 EMQ Technologies Co., Ltd. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%--------------------------------------------------------------------
+
+-module(emqx_statsd_proto_v1).
+
+-behaviour(emqx_bpapi).
+
+-export([ introduced_in/0
+
+        , start/1
+        , stop/1
+        , restart/1
+        ]).
+
+-include_lib("emqx/include/bpapi.hrl").
+
+introduced_in() ->
+    "5.0.0".
+
+-spec start([node()]) -> emqx_rpc:multicall_result().
+start(Nodes) ->
+    rpc:multicall(Nodes, emqx_statsd, do_start, [], 5000).
+
+-spec stop([node()]) -> emqx_rpc:multicall_result().
+stop(Nodes) ->
+    rpc:multicall(Nodes, emqx_statsd, do_stop, [], 5000).
+
+-spec restart([node()]) -> emqx_rpc:multicall_result().
+restart(Nodes) ->
+    rpc:multicall(Nodes, emqx_statsd, do_restart, [], 5000).

apps/emqx_statsd/test/emqx_statsd_SUITE.erl

@@ -27,3 +27,7 @@ t_statsd(_) ->
     end,
     gen_udp:close(Socket).
 
+t_management(_) ->
+    ?assertMatch(ok, emqx_statsd:start()),
+    ?assertMatch(ok, emqx_statsd:stop()),
+    ?assertMatch(ok, emqx_statsd:restart()).