From b588b88a6039a9e4160760132f00050a1e71e834 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Tue, 20 Jun 2023 15:43:37 +0200 Subject: [PATCH 1/2] chore: change autoclean interval default value to 24h There is currently a bug in OTP causing external backends to fail when merge schema (mnesia_schema:change_storage_type/3). To avoid forcing users to clean up the DB after the node is stopped for a short while (5m before this change), we increase the default auto-clean interval to 24 hours. This PR also has the autoclean config removed from examples. --- apps/emqx_conf/src/emqx_conf_schema.erl | 2 +- examples/cluster-with-dns.conf.example | 3 --- examples/cluster-with-etcd-ssl.conf.example | 3 --- examples/cluster-with-etcd.conf.example | 3 --- examples/cluster-with-k8s.conf.example | 3 --- examples/cluster-with-manual.conf.example | 3 --- examples/cluster-with-static.conf.example | 3 --- 7 files changed, 1 insertion(+), 19 deletions(-) diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl index e6cb93ac0..ce7bbb8b2 100644 --- a/apps/emqx_conf/src/emqx_conf_schema.erl +++ b/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 } diff --git a/examples/cluster-with-dns.conf.example b/examples/cluster-with-dns.conf.example index f979eb689..ae617a808 100644 --- a/examples/cluster-with-dns.conf.example +++ b/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 diff --git a/examples/cluster-with-etcd-ssl.conf.example b/examples/cluster-with-etcd-ssl.conf.example index b7c642770..d3a31c7d0 100644 --- a/examples/cluster-with-etcd-ssl.conf.example +++ b/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 diff --git a/examples/cluster-with-etcd.conf.example b/examples/cluster-with-etcd.conf.example index 17ab604d6..3eae3b980 100644 --- a/examples/cluster-with-etcd.conf.example +++ b/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 diff --git a/examples/cluster-with-k8s.conf.example b/examples/cluster-with-k8s.conf.example index 4fd329b24..7a0ad3b29 100644 --- a/examples/cluster-with-k8s.conf.example +++ b/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 diff --git a/examples/cluster-with-manual.conf.example b/examples/cluster-with-manual.conf.example index f075ea389..7c031b44a 100644 --- a/examples/cluster-with-manual.conf.example +++ b/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 } diff --git a/examples/cluster-with-static.conf.example b/examples/cluster-with-static.conf.example index 76a9d9980..e2263da15 100644 --- a/examples/cluster-with-static.conf.example +++ b/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 From 80fdb26b64ab912cd4181a69d91eae2681e30b61 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Tue, 20 Jun 2023 15:49:06 +0200 Subject: [PATCH 2/2] chore: bump to opensource edition dashboard v1.3.0-1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2453528be..ee0d306fa 100644 --- a/Makefile +++ b/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