Merge pull request #11105 from zmstone/0620-autoclean-default-value-to-24h

0620 autoclean default value to 24h

Makefile

@@ -15,7 +15,7 @@ endif
 
 # Dashboard version
 # from https://github.com/emqx/emqx-dashboard5
-export EMQX_DASHBOARD_VERSION ?= v1.3.0
+export EMQX_DASHBOARD_VERSION ?= v1.3.0-1
 export EMQX_EE_DASHBOARD_VERSION ?= e1.1.0
 
 # `:=` should be used here, otherwise the `$(shell ...)` will be executed every time when the variable is used

apps/emqx_conf/src/emqx_conf_schema.erl

@@ -165,7 +165,7 @@ fields("cluster") ->
                 emqx_schema:duration(),
                 #{
                     mapping => "mria.cluster_autoclean",
-                    default => <<"5m">>,
+                    default => <<"24h">>,
                     desc => ?DESC(cluster_autoclean),
                     'readOnly' => true
                 }

examples/cluster-with-dns.conf.example

@@ -16,9 +16,6 @@ cluster {
     ## List of core nodes that the replicant will connect to
     core_nodes = ["emqx1@192.168.0.1", "emqx2@192.168.0.2"]
 
-    ## Remove disconnected nodes from the cluster after this interval
-    autoclean = 5m
-
     ## If true, the node will try to heal network partitions automatically
     autoheal = true
 

examples/cluster-with-etcd-ssl.conf.example

@@ -16,9 +16,6 @@ cluster {
     ## List of core nodes that the replicant will connect to
     core_nodes = ["emqx1@192.168.0.1", "emqx2@192.168.0.2"]
 
-    ## Remove disconnected nodes from the cluster after this interval
-    autoclean = 5m
-
     ## If true, the node will try to heal network partitions automatically
     autoheal = true
 

examples/cluster-with-etcd.conf.example

@@ -16,9 +16,6 @@ cluster {
     ## List of core nodes that the replicant will connect to
     core_nodes = ["emqx1@192.168.0.1", "emqx2@192.168.0.2"]
 
-    ## Remove disconnected nodes from the cluster after this interval
-    autoclean = 5m
-
     ## If true, the node will try to heal network partitions automatically
     autoheal = true
 

examples/cluster-with-k8s.conf.example

@@ -16,9 +16,6 @@ cluster {
     ## List of core nodes that the replicant will connect to
     core_nodes = ["emqx1@192.168.0.1", "emqx2@192.168.0.2"]
 
-    ## Remove disconnected nodes from the cluster after this interval
-    autoclean = 5m
-
     ## If true, the node will try to heal network partitions automatically
     autoheal = true
 

examples/cluster-with-manual.conf.example

@@ -16,9 +16,6 @@ cluster {
     ## List of core nodes that the replicant will connect to
     core_nodes = ["emqx1@192.168.0.1", "emqx2@192.168.0.2"]
 
-    ## Remove disconnected nodes from the cluster after this interval
-    autoclean = 5m
-
     ## If true, the node will try to heal network partitions automatically
     autoheal = true
  }

examples/cluster-with-static.conf.example

@@ -16,9 +16,6 @@ cluster {
     ## List of core nodes that the replicant will connect to
     core_nodes = ["emqx1@192.168.0.1", "emqx2@192.168.0.2"]
 
-    ## Remove disconnected nodes from the cluster after this interval
-    autoclean = 5m
-
     ## If true, the node will try to heal network partitions automatically
     autoheal = true