Przeglądaj źródła

Merge pull request #10943 from zmstone/0605-hide-mcast-cluster-discovery

chore: start deprecating mcast cluster discovery
Zaiming (Stone) Shi 2 lat temu
rodzic
commit
ce4e49cd9e

+ 2 - 2
apps/emqx_conf/src/emqx_conf_schema.erl

@@ -143,7 +143,7 @@ fields("cluster") ->
             )},
             )},
         {"discovery_strategy",
         {"discovery_strategy",
             sc(
             sc(
-                hoconsc:enum([manual, static, mcast, dns, etcd, k8s]),
+                hoconsc:enum([manual, static, dns, etcd, k8s, mcast]),
                 #{
                 #{
                     default => manual,
                     default => manual,
                     desc => ?DESC(cluster_discovery_strategy),
                     desc => ?DESC(cluster_discovery_strategy),
@@ -198,7 +198,7 @@ fields("cluster") ->
         {"mcast",
         {"mcast",
             sc(
             sc(
                 ?R_REF(cluster_mcast),
                 ?R_REF(cluster_mcast),
-                #{}
+                #{importance => ?IMPORTANCE_HIDDEN}
             )},
             )},
         {"dns",
         {"dns",
             sc(
             sc(

+ 5 - 0
changes/ce/fix-10943.en.md

@@ -0,0 +1,5 @@
+Deprecated UDP mcast mechanism for cluster discovery.
+
+This feature has been planed for deprecation since 5.0 mainly due to the lack of
+actual production use.
+This feature code is not yet removed in 5.1, but the document interface is demoted.

+ 3 - 1
rel/i18n/emqx_conf_schema.hocon

@@ -755,7 +755,9 @@ cluster_discovery_strategy.desc:
 - static: Configure static nodes list by setting <code>seeds</code> in config file.<br/>
 - static: Configure static nodes list by setting <code>seeds</code> in config file.<br/>
 - dns: Use DNS A record to discover peer nodes.<br/>
 - dns: Use DNS A record to discover peer nodes.<br/>
 - etcd: Use etcd to discover peer nodes.<br/>
 - etcd: Use etcd to discover peer nodes.<br/>
-- k8s: Use Kubernetes API to discover peer pods."""
+- k8s: Use Kubernetes API to discover peer pods.
+- mcast: Deprecated since 5.1, will be removed in 5.2.
+  This supports discovery via UDP multicast."""
 
 
 cluster_discovery_strategy.label:
 cluster_discovery_strategy.label:
 """Cluster Discovery Strategy"""
 """Cluster Discovery Strategy"""