From 2c1b1fbfa87c5a86c6760bd1aa38b08dcf289db1 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Fri, 20 Aug 2021 14:31:47 +0800 Subject: [PATCH] chore(config): rename cluster_call to hot_config_loader --- apps/emqx/etc/emqx.conf | 2 ++ apps/emqx/src/emqx_cluster_rpc.erl | 2 +- apps/emqx/src/emqx_cluster_rpc_handler.erl | 4 ++-- apps/emqx/src/emqx_schema.erl | 6 +++--- apps/emqx/test/emqx_cluster_rpc_SUITE.erl | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/emqx/etc/emqx.conf b/apps/emqx/etc/emqx.conf index e3c701e28..7c404ff2d 100644 --- a/apps/emqx/etc/emqx.conf +++ b/apps/emqx/etc/emqx.conf @@ -222,6 +222,8 @@ listeners.quic.default { ## If not set, the global configs are used for this listener. ## ## See `zones.` for more details. + ## NOTE: This is a cluster-wide configuration. + ## It requires all nodes to be stopped before changing it. ## ## @doc listeners.quic..zone ## ValueType: String diff --git a/apps/emqx/src/emqx_cluster_rpc.erl b/apps/emqx/src/emqx_cluster_rpc.erl index a4c54d01e..5ddfe5742 100644 --- a/apps/emqx/src/emqx_cluster_rpc.erl +++ b/apps/emqx/src/emqx_cluster_rpc.erl @@ -64,7 +64,7 @@ mnesia(copy) -> ok = ekka_mnesia:copy_table(cluster_rpc_commit, disc_copies). start_link() -> - RetryMs = emqx:get_config([broker, cluster_call, retry_interval]), + RetryMs = emqx:get_config([broker, hot_config_loader, retry_interval]), start_link(node(), ?MODULE, RetryMs). start_link(Node, Name, RetryMs) -> gen_statem:start_link({local, Name}, ?MODULE, [Node, RetryMs], []). diff --git a/apps/emqx/src/emqx_cluster_rpc_handler.erl b/apps/emqx/src/emqx_cluster_rpc_handler.erl index 5f548e7fd..4da219165 100644 --- a/apps/emqx/src/emqx_cluster_rpc_handler.erl +++ b/apps/emqx/src/emqx_cluster_rpc_handler.erl @@ -28,8 +28,8 @@ -define(MFA_HISTORY_LEN, 100). start_link() -> - MaxHistory = emqx:get_config([broker, cluster_call, mfa_max_history]), - CleanupMs = emqx:get_config([broker, cluster_call, mfa_cleanup_interval]), + MaxHistory = emqx:get_config([broker, hot_config_loader, mfa_max_history]), + CleanupMs = emqx:get_config([broker, hot_config_loader, mfa_cleanup_interval]), start_link(MaxHistory, CleanupMs). start_link(MaxHistory, CleanupMs) -> diff --git a/apps/emqx/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl index cb250f575..3fb986f1e 100644 --- a/apps/emqx/src/emqx_schema.erl +++ b/apps/emqx/src/emqx_schema.erl @@ -293,7 +293,7 @@ fields("broker") -> , {"shared_dispatch_ack_enabled", t(boolean(), undefined, false)} , {"route_batch_clean", t(boolean(), undefined, true)} , {"perf", ref("perf")} - , {"cluster_call", ref("cluster_call")} + , {"hot_config_loader", ref("hot_config_loader")} ]; fields("perf") -> @@ -326,8 +326,8 @@ fields("sysmon_os") -> , {"procmem_high_watermark", t(percent(), undefined, "5%")} ]; -fields("cluster_call") -> - [{"retry_interval", t(duration(), undefined, "2s")} +fields("hot_config_loader") -> + [{"retry_interval", t(duration(), undefined, "1s")} , {"mfa_max_history", t(range(1, 500), undefined, 50)} , {"mfa_cleanup_interval", t(duration(), undefined, "5m")} ]; diff --git a/apps/emqx/test/emqx_cluster_rpc_SUITE.erl b/apps/emqx/test/emqx_cluster_rpc_SUITE.erl index 5106183bb..b03137796 100644 --- a/apps/emqx/test/emqx_cluster_rpc_SUITE.erl +++ b/apps/emqx/test/emqx_cluster_rpc_SUITE.erl @@ -41,7 +41,7 @@ init_per_suite(Config) -> application:load(emqx), ok = ekka:start(), emqx_cluster_rpc:mnesia(copy), - emqx_config:put([broker, cluster_call], #{ + emqx_config:put([broker, hot_config_loader], #{ mfa_max_history => 100, mfa_cleanup_interval => 1000, retry_interval => 900