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

feat: enforce singleton discovery strategy when using DS `builtin_local` backend 

Fixes https://emqx.atlassian.net/browse/EMQX-12493
This commit is contained in:
Thales Macedo Garitezi 2024-06-13 16:57:46 -03:00
parent cba5c7bb45
commit 52e6c88941
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
apps/emqx_conf/src/emqx_conf_schema.erl
View File

@ -134,10 +134,27 @@ roots() ->
lists:flatmap(fun roots/1, common_apps()).
validations() ->
[{check_node_name_and_discovery_strategy, fun validate_cluster_strategy/1}] ++
[
{check_node_name_and_discovery_strategy, fun validate_cluster_strategy/1},
{validate_durable_sessions_strategy, fun validate_durable_sessions_strategy/1}
] ++
hocon_schema:validations(emqx_schema) ++
lists:flatmap(fun hocon_schema:validations/1, common_apps()).
validate_durable_sessions_strategy(Conf) ->
DSEnabled = hocon_maps:get("durable_sessions.enable", Conf),
DiscoveryStrategy = hocon_maps:get("cluster.discovery_strategy", Conf),
DSBackend = hocon_maps:get("durable_storage.messages.backend", Conf),
case {DSEnabled, DSBackend} of
{true, builtin_local} when DiscoveryStrategy =/= singleton ->
{error, <<
"cluster discovery strategy must be 'singleton' when"
" durable storage backend is builtin_local"
>>};
_ ->
ok
end.
common_apps() ->
Edition = emqx_release:edition(),
lists:filtermap(
@ -166,7 +183,7 @@ fields("cluster") ->
)},
{"discovery_strategy",
sc(
hoconsc:enum([manual, static, dns, etcd, k8s]),
hoconsc:enum([manual, static, singleton, dns, etcd, k8s]),
#{
default => manual,
desc => ?DESC(cluster_discovery_strategy),