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

Merge pull request #12372 from id/0123-add-default-delivery-rate 

retainer: add default delivery rate
This commit is contained in:
Ivan Dyachkov 2024-01-29 10:34:58 +01:00 committed by GitHub
parent 3516a01ab9 fa6d65887d
commit 35f86ded1a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 58 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/emqx_retainer/src/emqx_retainer_schema.erl
View File

@ -81,6 +81,7 @@ fields("retainer") ->
#{ #{
required => false, required => false,
desc => ?DESC(delivery_rate), desc => ?DESC(delivery_rate),
default => <<"1000/s">>,
example => <<"1000/s">>, example => <<"1000/s">>,
aliases => [deliver_rate] aliases => [deliver_rate]
} }

9
apps/emqx_retainer/test/emqx_retainer_SUITE.erl
View File

@ -256,6 +256,10 @@ t_wildcard_subscription(_) ->
ok = emqtt:disconnect(C1). ok = emqtt:disconnect(C1).
t_message_expiry(_) -> t_message_expiry(_) ->
ConfMod = fun(Conf) ->
Conf#{<<"delivery_rate">> := <<"infinity">>}
end,
Case = fun() ->
{ok, C1} = emqtt:start_link([{clean_start, true}, {proto_ver, v5}]), {ok, C1} = emqtt:start_link([{clean_start, true}, {proto_ver, v5}]),
{ok, _} = emqtt:connect(C1), {ok, _} = emqtt:connect(C1),
@ -310,7 +314,9 @@ t_message_expiry(_) ->
emqtt:publish(C1, <<"retained/3">>, <<"">>, [{qos, 0}, {retain, true}]), emqtt:publish(C1, <<"retained/3">>, <<"">>, [{qos, 0}, {retain, true}]),
emqtt:publish(C1, <<"$SYS/retained/4">>, <<"">>, [{qos, 0}, {retain, true}]), emqtt:publish(C1, <<"$SYS/retained/4">>, <<"">>, [{qos, 0}, {retain, true}]),
ok = emqtt:disconnect(C1). ok = emqtt:disconnect(C1)
end,
with_conf(ConfMod, Case).
t_message_expiry_2(_) -> t_message_expiry_2(_) ->
ConfMod = fun(Conf) -> ConfMod = fun(Conf) ->
@ -410,6 +416,7 @@ t_flow_control(_) ->
JsonCfg = make_limiter_json(<<"1/1s">>), JsonCfg = make_limiter_json(<<"1/1s">>),
emqx_limiter_server:add_bucket(emqx_retainer, internal, LimiterCfg), emqx_limiter_server:add_bucket(emqx_retainer, internal, LimiterCfg),
emqx_retainer:update_config(#{ emqx_retainer:update_config(#{
<<"delivery_rate">> => <<"1/1s">>,
<<"flow_control">> => <<"flow_control">> =>
#{ #{
<<"batch_read_number">> => 1, <<"batch_read_number">> => 1,