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

fix：change default configuration of `max_topic_levels` #6294

This commit is contained in:
JimMoen 2021-11-25 16:16:54 +08:00 committed by GitHub
parent 15b71c118b 289415b5aa
commit 18a9c0e177
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etc/emqx.conf
View File

@ -663,9 +663,11 @@ mqtt.max_packet_size = 1MB
mqtt.max_clientid_len = 65535 mqtt.max_clientid_len = 65535
## Maximum topic levels allowed. 0 means no limit. ## Maximum topic levels allowed. 0 means no limit.
## Depth so big may lead to subscribing performance issues.
## ##
## Value: Number ## Value: Number [0-65535]
mqtt.max_topic_levels = 0 ## Default: 128
mqtt.max_topic_levels = 128
## Maximum QoS allowed. ## Maximum QoS allowed.
## ##
@ -769,8 +771,9 @@ zone.external.force_gc_policy = 16000|16MB
## Maximum topic levels allowed. 0 means no limit. ## Maximum topic levels allowed. 0 means no limit.
## ##
## Value: Number ## Value: Number [0-65535]
## zone.external.max_topic_levels = 7 ## Default: 7
zone.external.max_topic_levels = 7
## Maximum QoS allowed. ## Maximum QoS allowed.
## ##

2
priv/emqx.schema
View File

@ -800,7 +800,7 @@ end}.
%% @doc Set the Maximum topic levels. %% @doc Set the Maximum topic levels.
{mapping, "mqtt.max_topic_levels", "emqx.max_topic_levels", [ {mapping, "mqtt.max_topic_levels", "emqx.max_topic_levels", [
{default, 0}, {default, 128},
{datatype, integer} {datatype, integer}
]}. ]}.

3
test/emqx_channel_SUITE.erl
View File

@ -83,7 +83,7 @@ t_chan_caps(_) ->
#{max_clientid_len := 65535, #{max_clientid_len := 65535,
max_qos_allowed := 2, max_qos_allowed := 2,
max_topic_alias := 65535, max_topic_alias := 65535,
max_topic_levels := 0, max_topic_levels := 128,
retain_available := true, retain_available := true,
shared_subscription := true, shared_subscription := true,
subscription_identifiers := true, subscription_identifiers := true,
@ -835,4 +835,3 @@ session(InitFields) when is_map(InitFields) ->
quota() -> quota() ->
emqx_limiter:init(zone, [{conn_messages_routing, {5, 1}}, emqx_limiter:init(zone, [{conn_messages_routing, {5, 1}},
{overall_messages_routing, {10, 1}}]). {overall_messages_routing, {10, 1}}]).