From db26956f3e83f71c35bdd4fc7eaca429a769b40a Mon Sep 17 00:00:00 2001 From: JianBo He Date: Tue, 26 Jul 2022 12:12:13 +0800 Subject: [PATCH 1/4] feat(exproto): keeping client information up to date --- apps/emqx_exproto/src/emqx_exproto_channel.erl | 9 +++++---- apps/emqx_exproto/src/emqx_exproto_conn.erl | 10 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/emqx_exproto/src/emqx_exproto_channel.erl b/apps/emqx_exproto/src/emqx_exproto_channel.erl index dce3b36e1..80e5f4045 100644 --- a/apps/emqx_exproto/src/emqx_exproto_channel.erl +++ b/apps/emqx_exproto/src/emqx_exproto_channel.erl @@ -260,7 +260,8 @@ handle_timeout(_TRef, {keepalive, StatVal}, {ok, reset_timer(alive_timer, NChannel)}; {error, timeout} -> Req = #{type => 'KEEPALIVE'}, - {ok, try_dispatch(on_timer_timeout, wrap(Req), Channel)} + NChannel = clean_timer(alive_timer, Channel), + {ok, try_dispatch(on_timer_timeout, wrap(Req), NChannel)} end; handle_timeout(_TRef, force_close, Channel = #channel{closed_reason = Reason}) -> @@ -327,7 +328,7 @@ handle_call({start_timer, keepalive, Interval}, NConnInfo = ConnInfo#{keepalive => Interval}, NClientInfo = ClientInfo#{keepalive => Interval}, NChannel = Channel#channel{conninfo = NConnInfo, clientinfo = NClientInfo}, - {reply, ok, ensure_keepalive(NChannel)}; + {reply, ok, [{event, updated}], ensure_keepalive(NChannel)}; handle_call({subscribe, TopicFilter, Qos}, Channel = #channel{ @@ -339,13 +340,13 @@ handle_call({subscribe, TopicFilter, Qos}, {reply, {error, ?RESP_PERMISSION_DENY, <<"ACL deny">>}, Channel}; _ -> {ok, NChannel} = do_subscribe([{TopicFilter, #{qos => Qos}}], Channel), - {reply, ok, NChannel} + {reply, ok, [{event, updated}], NChannel} end; handle_call({unsubscribe, TopicFilter}, Channel = #channel{conn_state = connected}) -> {ok, NChannel} = do_unsubscribe([{TopicFilter, #{}}], Channel), - {reply, ok, NChannel}; + {reply, ok, [{event, updated}], NChannel}; handle_call({publish, Topic, Qos, Payload}, Channel = #channel{ diff --git a/apps/emqx_exproto/src/emqx_exproto_conn.erl b/apps/emqx_exproto/src/emqx_exproto_conn.erl index 0e83e96c4..5c56731d6 100644 --- a/apps/emqx_exproto/src/emqx_exproto_conn.erl +++ b/apps/emqx_exproto/src/emqx_exproto_conn.erl @@ -450,11 +450,11 @@ handle_msg({event, disconnected}, State = #state{channel = Channel}) -> emqx_cm:connection_closed(ClientId), {ok, State}; -%handle_msg({event, _Other}, State = #state{channel = Channel}) -> -% ClientId = emqx_exproto_channel:info(clientid, Channel), -% emqx_cm:set_chan_info(ClientId, info(State)), -% emqx_cm:set_chan_stats(ClientId, stats(State)), -% {ok, State}; +handle_msg({event, _Other}, State = #state{channel = Channel}) -> + ClientId = emqx_exproto_channel:info(clientid, Channel), + emqx_cm:set_chan_info(ClientId, info(State)), + emqx_cm:set_chan_stats(ClientId, stats(State)), + {ok, State}; handle_msg({timeout, TRef, TMsg}, State) -> handle_timeout(TRef, TMsg, State); From c188eeb1d957326ce5530831d08c84852b13d72a Mon Sep 17 00:00:00 2001 From: JianBo He Date: Tue, 26 Jul 2022 17:10:11 +0800 Subject: [PATCH 2/4] fix(exproto): refine keepalive timer checking --- apps/emqx_exproto/src/emqx_exproto_conn.erl | 28 ++++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/apps/emqx_exproto/src/emqx_exproto_conn.erl b/apps/emqx_exproto/src/emqx_exproto_conn.erl index 5c56731d6..152c0edf1 100644 --- a/apps/emqx_exproto/src/emqx_exproto_conn.erl +++ b/apps/emqx_exproto/src/emqx_exproto_conn.erl @@ -211,16 +211,35 @@ esockd_setopts({esockd_transport, Socket}, Opts) -> %% FIXME: DTLS works?? esockd_transport:setopts(Socket, Opts). -esockd_getstat({udp, _SockPid, Sock}, Stats) -> - inet:getstat(Sock, Stats); esockd_getstat({esockd_transport, Sock}, Stats) -> - esockd_transport:getstat(Sock, Stats). + esockd_transport:getstat(Sock, Stats); +esockd_getstat({udp, _SockPid, _Sock}, Stats) -> + {ok, lists:map(fun(K) -> {K, get_stats(K)} end, Stats)}. -send(Data, #state{socket = {udp, _SockPid, Sock}, peername = {Ip, Port}}) -> +send(Data, State = #state{socket = {udp, _SockPid, Sock}, peername = {Ip, Port}}) -> + incr_send_stats(Data, State), gen_udp:send(Sock, Ip, Port, Data); send(Data, #state{socket = {esockd_transport, Sock}}) -> esockd_transport:async_send(Sock, Data). +incr_recv_stats(Data, #state{socket = {udp, _, _}}) -> + incr_stats(recv_oct, byte_size(Data)), + incr_stats(recv_cnt, 1). + +incr_send_stats(Data, #state{socket = {udp, _, _}}) -> + incr_stats(send_oct, byte_size(Data)), + incr_stats(send_cnt, 1). + +incr_stats(Key, Cnt) -> + Cnt0 = get_stats(Key), + put({stats, Key}, Cnt0 + Cnt). + +get_stats(Key) -> + case get({stats, Key}) of + undefined -> 0; + Cnt -> Cnt + end. + %%-------------------------------------------------------------------- %% callbacks %%-------------------------------------------------------------------- @@ -386,6 +405,7 @@ handle_msg({'$gen_cast', Req}, State) -> with_channel(handle_cast, [Req], State); handle_msg({datagram, _SockPid, Data}, State) -> + incr_recv_stats(Data, State), process_incoming(Data, State); handle_msg({Inet, _Sock, Data}, State) when Inet == tcp; Inet == ssl -> From a5bf1a3b2dfa70d6704cf0be9ab24be1775dcbb6 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Wed, 27 Jul 2022 09:38:46 +0800 Subject: [PATCH 3/4] chore(exproto): update app.src & appup.src --- apps/emqx_exproto/src/emqx_exproto.app.src | 2 +- apps/emqx_exproto/src/emqx_exproto.appup.src | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/emqx_exproto/src/emqx_exproto.app.src b/apps/emqx_exproto/src/emqx_exproto.app.src index 41c19f752..76bc9fa85 100644 --- a/apps/emqx_exproto/src/emqx_exproto.app.src +++ b/apps/emqx_exproto/src/emqx_exproto.app.src @@ -1,6 +1,6 @@ {application, emqx_exproto, [{description, "EMQ X Extension for Protocol"}, - {vsn, "4.3.8"}, %% 4.3.3 is used by ee + {vsn, "4.3.9"}, %% 4.3.3 is used by ee {modules, []}, {registered, []}, {mod, {emqx_exproto_app, []}}, diff --git a/apps/emqx_exproto/src/emqx_exproto.appup.src b/apps/emqx_exproto/src/emqx_exproto.appup.src index 33bd4386c..96b3d9ea3 100644 --- a/apps/emqx_exproto/src/emqx_exproto.appup.src +++ b/apps/emqx_exproto/src/emqx_exproto.appup.src @@ -1,7 +1,10 @@ %% -*- mode: erlang -*- %% Unless you know what you are doing, DO NOT edit manually!! {VSN, - [{<<"4\\.3\\.[6-7]">>, + [{"4.3.8", + [{load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]}, + {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, + {<<"4\\.3\\.[6-7]">>, [{load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, {<<"4\\.3\\.[2-5]">>, [{load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]}, @@ -12,7 +15,10 @@ {load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]}, {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}], - [{<<"4\\.3\\.[6-7]">>, + [{"4.3.8", + [{load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]}, + {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, + {<<"4\\.3\\.[6-7]">>, [{load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, {<<"4\\.3\\.[2-5]">>, [{load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]}, From 448ae41a641932e800ae2c09213e73ce012093df Mon Sep 17 00:00:00 2001 From: JianBo He Date: Wed, 27 Jul 2022 09:43:04 +0800 Subject: [PATCH 4/4] chore: update changes --- CHANGES-4.3.md | 2 ++ apps/emqx_exproto/src/emqx_exproto.appup.src | 14 ++------------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md index ac9a11a0d..c6bb1b34d 100644 --- a/CHANGES-4.3.md +++ b/CHANGES-4.3.md @@ -20,6 +20,8 @@ File format: - Fixed crash when shared persistent subscription [#8441] - Fixed issue in Lua hook that prevented messages from being rejected [#8535] +- Fix ExProto UDP client keepalive checking error. + This causes the clients to not expire as long as a new UDP packet arrives [#8575] ### Enhancements - HTTP API(GET /rules/) support for pagination and fuzzy filtering. [#8450] diff --git a/apps/emqx_exproto/src/emqx_exproto.appup.src b/apps/emqx_exproto/src/emqx_exproto.appup.src index 96b3d9ea3..d6406b239 100644 --- a/apps/emqx_exproto/src/emqx_exproto.appup.src +++ b/apps/emqx_exproto/src/emqx_exproto.appup.src @@ -1,12 +1,7 @@ %% -*- mode: erlang -*- %% Unless you know what you are doing, DO NOT edit manually!! {VSN, - [{"4.3.8", - [{load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]}, - {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, - {<<"4\\.3\\.[6-7]">>, - [{load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, - {<<"4\\.3\\.[2-5]">>, + [{<<"4\\.3\\.[2-8]">>, [{load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]}, {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, {<<"4\\.3\\.[0-1]">>, @@ -15,12 +10,7 @@ {load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]}, {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}], - [{"4.3.8", - [{load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]}, - {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, - {<<"4\\.3\\.[6-7]">>, - [{load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, - {<<"4\\.3\\.[2-5]">>, + [{<<"4\\.3\\.[2-8]">>, [{load_module,emqx_exproto_conn,brutal_purge,soft_purge,[]}, {load_module,emqx_exproto_channel,brutal_purge,soft_purge,[]}]}, {<<"4\\.3\\.[0-1]">>,