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

Merge pull request #11914 from ieQu1/dev/speed-up-poll 

fix(ds): Speed up polling for the new messages
This commit is contained in:
ieQu1 2023-11-09 16:40:06 +01:00 committed by GitHub
parent 92e978e50e cf4a46a78b
commit 42a9f0eb6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx/src/emqx_persistent_message_ds_replayer.erl
View File

@ -28,6 +28,10 @@
-include("emqx_persistent_session_ds.hrl"). -include("emqx_persistent_session_ds.hrl").
-ifdef(TEST).
-include_lib("eunit/include/eunit.hrl").
-endif.
%%================================================================================ %%================================================================================
%% Type declarations %% Type declarations
%%================================================================================ %%================================================================================

16
apps/emqx/src/emqx_persistent_session_ds.erl
View File

@ -344,7 +344,15 @@ deliver(_ClientInfo, _Delivers, Session) ->
handle_timeout(_ClientInfo, pull, Session = #{id := Id, inflight := Inflight0}) -> handle_timeout(_ClientInfo, pull, Session = #{id := Id, inflight := Inflight0}) ->
WindowSize = 100, WindowSize = 100,
{Publishes, Inflight} = emqx_persistent_message_ds_replayer:poll(Id, Inflight0, WindowSize), {Publishes, Inflight} = emqx_persistent_message_ds_replayer:poll(Id, Inflight0, WindowSize),
ensure_timer(pull), %% TODO: make these values configurable:
Timeout =
case Publishes of
[] ->
100;
[_ | _] ->
0
end,
ensure_timer(pull, Timeout),
{ok, Publishes, Session#{inflight => Inflight}}; {ok, Publishes, Session#{inflight => Inflight}};
handle_timeout(_ClientInfo, get_streams, Session = #{id := Id}) -> handle_timeout(_ClientInfo, get_streams, Session = #{id := Id}) ->
renew_streams(Id), renew_streams(Id),
@ -714,5 +722,9 @@ ensure_timers() ->
-spec ensure_timer(pull | get_streams) -> ok. -spec ensure_timer(pull | get_streams) -> ok.
ensure_timer(Type) -> ensure_timer(Type) ->
_ = emqx_utils:start_timer(100, {emqx_session, Type}), ensure_timer(Type, 100).
-spec ensure_timer(pull | get_streams, non_neg_integer()) -> ok.
ensure_timer(Type, Timeout) ->
_ = emqx_utils:start_timer(Timeout, {emqx_session, Type}),
ok. ok.