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

fix(sessds): Rename last_alive_update_interval -> heartbeat_interval

This commit is contained in:
ieQu1 2024-05-17 01:16:13 +02:00
parent 73f17249e9
commit 6f30c1c541
No known key found for this signature in database
GPG Key ID: 488654DF3FED6FDE
9 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx/integration_test/emqx_persistent_session_ds_SUITE.erl
View File

@ -57,7 +57,7 @@ init_per_testcase(t_session_gc = TestCase, Config) ->
roles => [core, core, core], roles => [core, core, core],
extra_emqx_conf => extra_emqx_conf =>
"\n durable_sessions {" "\n durable_sessions {"
"\n last_alive_update_interval = 500ms " "\n heartbeat_interval = 500ms "
"\n session_gc_interval = 1s " "\n session_gc_interval = 1s "
"\n session_gc_batch_size = 2 " "\n session_gc_batch_size = 2 "
"\n }" "\n }"

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

@ -1146,11 +1146,11 @@ receive_maximum(ConnInfo) ->
expiry_interval(ConnInfo) -> expiry_interval(ConnInfo) ->
maps:get(expiry_interval, ConnInfo, 0). maps:get(expiry_interval, ConnInfo, 0).
%% Note: we don't allow overriding `last_alive_update_interval' per %% Note: we don't allow overriding `heartbeat_interval' per
%% zone, since the GC process is responsible for all sessions %% zone, since the GC process is responsible for all sessions
%% regardless of the zone. %% regardless of the zone.
bump_interval() -> bump_interval() ->
emqx_config:get([durable_sessions, last_alive_update_interval]). emqx_config:get([durable_sessions, heartbeat_interval]).
get_config(#{zone := Zone}, Key) -> get_config(#{zone := Zone}, Key) ->
emqx_config:get_zone_conf(Zone, [durable_sessions | Key]). emqx_config:get_zone_conf(Zone, [durable_sessions | Key]).

2
apps/emqx/src/emqx_persistent_session_ds_gc_worker.erl
View File

@ -134,7 +134,7 @@ start_gc() ->
gc_context() -> gc_context() ->
GCInterval = emqx_config:get([durable_sessions, session_gc_interval]), GCInterval = emqx_config:get([durable_sessions, session_gc_interval]),
BumpInterval = emqx_config:get([durable_sessions, last_alive_update_interval]), BumpInterval = emqx_config:get([durable_sessions, heartbeat_interval]),
TimeThreshold = max(GCInterval, BumpInterval) * 3, TimeThreshold = max(GCInterval, BumpInterval) * 3,
NowMS = now_ms(), NowMS = now_ms(),
#{ #{

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

@ -1678,12 +1678,12 @@ fields("durable_sessions") ->
desc => ?DESC(session_ds_idle_poll_interval) desc => ?DESC(session_ds_idle_poll_interval)
} }
)}, )},
{"last_alive_update_interval", {"heartbeat_interval",
sc( sc(
timeout_duration(), timeout_duration(),
#{ #{
default => <<"5000ms">>, default => <<"5000ms">>,
desc => ?DESC(session_ds_last_alive_update_interval) desc => ?DESC(session_ds_heartbeat_interval)
} }
)}, )},
{"renew_streams_interval", {"renew_streams_interval",

2
apps/emqx/test/emqx_config_SUITE.erl
View File

@ -471,7 +471,7 @@ zone_global_defaults() ->
batch_size => 100, batch_size => 100,
force_persistence => false, force_persistence => false,
idle_poll_interval => 100, idle_poll_interval => 100,
last_alive_update_interval => 5000, heartbeat_interval => 5000,
message_retention_period => 86400000, message_retention_period => 86400000,
renew_streams_interval => 5000, renew_streams_interval => 5000,
session_gc_batch_size => 100, session_gc_batch_size => 100,

2
apps/emqx/test/emqx_persistent_session_SUITE.erl
View File

@ -78,7 +78,7 @@ init_per_group(persistence_enabled, Config) ->
?EMQX_CONFIG ++ ?EMQX_CONFIG ++
"durable_sessions {\n" "durable_sessions {\n"
" enable = true\n" " enable = true\n"
" last_alive_update_interval = 100ms\n" " heartbeat_interval = 100ms\n"
" renew_streams_interval = 100ms\n" " renew_streams_interval = 100ms\n"
" session_gc_interval = 2s\n" " session_gc_interval = 2s\n"
"}"}, "}"},

2
apps/emqx/test/emqx_takeover_SUITE.erl
View File

@ -71,7 +71,7 @@ init_per_group(persistence_enabled = Group, Config) ->
{emqx, {emqx,
"durable_sessions = {\n" "durable_sessions = {\n"
" enable = true\n" " enable = true\n"
" last_alive_update_interval = 100ms\n" " heartbeat_interval = 100ms\n"
" renew_streams_interval = 100ms\n" " renew_streams_interval = 100ms\n"
" session_gc_interval = 2s\n" " session_gc_interval = 2s\n"
"}\n"} "}\n"}

2
apps/emqx_management/test/emqx_mgmt_SUITE.erl
View File

@ -61,7 +61,7 @@ init_per_group(persistence_enabled, Config) ->
{emqx, {emqx,
"durable_sessions {\n" "durable_sessions {\n"
" enable = true\n" " enable = true\n"
" last_alive_update_interval = 100ms\n" " heartbeat_interval = 100ms\n"
" renew_streams_interval = 100ms\n" " renew_streams_interval = 100ms\n"
"}"}, "}"},
emqx_management emqx_management

1
changes/ce/fix-13062.en.md Normal file
View File

@ -0,0 +1 @@
Rename configuration parameter `durable_sessions.last_alive_update_interval` to `durable_sessions.heartbeat_interval`.