From 1a86c21e20a4361f57fd5bb9760b00a5f9c82ea7 Mon Sep 17 00:00:00 2001 From: ieQu1 <99872536+ieQu1@users.noreply.github.com> Date: Tue, 12 Sep 2023 17:41:17 +0200 Subject: [PATCH 1/2] fix(distribution): Set prevent_overlapping_partitions to false --- apps/emqx_conf/src/emqx_conf_schema.erl | 10 ++++++++++ rel/i18n/emqx_conf_schema.hocon | 3 +++ 2 files changed, 13 insertions(+) diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl index 94cdd2ecd..b97293544 100644 --- a/apps/emqx_conf/src/emqx_conf_schema.erl +++ b/apps/emqx_conf/src/emqx_conf_schema.erl @@ -221,6 +221,16 @@ fields("cluster") -> sc( ?R_REF(cluster_k8s), #{} + )}, + {"prevent_overlapping_partitions", + sc( + boolean(), + #{ + mapping => "kernel.prevent_overlapping_partitions", + desc => ?DESC(prevent_overlapping_partitions), + default => false, + importance => ?IMPORTANCE_HIDDEN + } )} ]; fields(cluster_static) -> diff --git a/rel/i18n/emqx_conf_schema.hocon b/rel/i18n/emqx_conf_schema.hocon index 442df1fa8..18cefc94a 100644 --- a/rel/i18n/emqx_conf_schema.hocon +++ b/rel/i18n/emqx_conf_schema.hocon @@ -801,4 +801,7 @@ Defaults to 100000.""" node_channel_cleanup_batch_size.label: """Node Channel Cleanup Batch Size""" +prevent_overlapping_partitions.desc: +"""https://www.erlang.org/doc/man/global.html#description""" + } From b41310af9caad669843e83be70bf2361bb34147f Mon Sep 17 00:00:00 2001 From: ieQu1 <99872536+ieQu1@users.noreply.github.com> Date: Tue, 12 Sep 2023 20:01:56 +0200 Subject: [PATCH 2/2] fix: Add prevent_overlappiing_partitions to vm_args Co-authored-by: Thales Macedo Garitezi --- apps/emqx_conf/src/emqx_conf_schema.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl index b97293544..d8a0c635f 100644 --- a/apps/emqx_conf/src/emqx_conf_schema.erl +++ b/apps/emqx_conf/src/emqx_conf_schema.erl @@ -226,7 +226,7 @@ fields("cluster") -> sc( boolean(), #{ - mapping => "kernel.prevent_overlapping_partitions", + mapping => "vm_args.-kernel prevent_overlapping_partitions", desc => ?DESC(prevent_overlapping_partitions), default => false, importance => ?IMPORTANCE_HIDDEN