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

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

0620 autoclean default value to 24h
This commit is contained in:
Zaiming (Stone) Shi 2023-06-20 17:01:38 +02:00 committed by GitHub
parent 8f595cbeca 80fdb26b64
commit b11341a23b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -15,7 +15,7 @@ endif
# Dashboard version # Dashboard version
# from https://github.com/emqx/emqx-dashboard5 # 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 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 # `:=` should be used here, otherwise the `$(shell ...)` will be executed every time when the variable is used

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

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

3
examples/cluster-with-dns.conf.example
View File

@ -16,9 +16,6 @@ cluster {
## List of core nodes that the replicant will connect to ## List of core nodes that the replicant will connect to
core_nodes = ["emqx1@192.168.0.1", "emqx2@192.168.0.2"] 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 ## If true, the node will try to heal network partitions automatically
autoheal = true autoheal = true

3
examples/cluster-with-etcd-ssl.conf.example
View File

@ -16,9 +16,6 @@ cluster {
## List of core nodes that the replicant will connect to ## List of core nodes that the replicant will connect to
core_nodes = ["emqx1@192.168.0.1", "emqx2@192.168.0.2"] 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 ## If true, the node will try to heal network partitions automatically
autoheal = true autoheal = true

3
examples/cluster-with-etcd.conf.example
View File

@ -16,9 +16,6 @@ cluster {
## List of core nodes that the replicant will connect to ## List of core nodes that the replicant will connect to
core_nodes = ["emqx1@192.168.0.1", "emqx2@192.168.0.2"] 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 ## If true, the node will try to heal network partitions automatically
autoheal = true autoheal = true

3
examples/cluster-with-k8s.conf.example
View File

@ -16,9 +16,6 @@ cluster {
## List of core nodes that the replicant will connect to ## List of core nodes that the replicant will connect to
core_nodes = ["emqx1@192.168.0.1", "emqx2@192.168.0.2"] 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 ## If true, the node will try to heal network partitions automatically
autoheal = true autoheal = true

3
examples/cluster-with-manual.conf.example
View File

@ -16,9 +16,6 @@ cluster {
## List of core nodes that the replicant will connect to ## List of core nodes that the replicant will connect to
core_nodes = ["emqx1@192.168.0.1", "emqx2@192.168.0.2"] 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 ## If true, the node will try to heal network partitions automatically
autoheal = true autoheal = true
} }

3
examples/cluster-with-static.conf.example
View File

@ -16,9 +16,6 @@ cluster {
## List of core nodes that the replicant will connect to ## List of core nodes that the replicant will connect to
core_nodes = ["emqx1@192.168.0.1", "emqx2@192.168.0.2"] 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 ## If true, the node will try to heal network partitions automatically
autoheal = true autoheal = true