From ee137734960499c30c053a313f04a1a8db143d0c Mon Sep 17 00:00:00 2001 From: zmstone Date: Thu, 4 Jul 2024 21:34:35 +0200 Subject: [PATCH] refactor: rename rpc.tcp_client_num to rpc.client_num tcp_client_num is kept as an alias --- apps/emqx/src/emqx_rpc.erl | 2 +- apps/emqx_conf/src/emqx_conf_schema.erl | 5 +++-- rel/i18n/emqx_conf_schema.hocon | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/emqx/src/emqx_rpc.erl b/apps/emqx/src/emqx_rpc.erl index 5cc8ca4df..19e450457 100644 --- a/apps/emqx/src/emqx_rpc.erl +++ b/apps/emqx/src/emqx_rpc.erl @@ -137,7 +137,7 @@ maybe_badrpc(Delivery) -> Delivery. max_client_num() -> - emqx:get_config([rpc, tcp_client_num], ?DefaultClientNum). + emqx:get_config([rpc, client_num], ?DefaultClientNum). -spec unwrap_erpc(emqx_rpc:erpc(A) | [emqx_rpc:erpc(A)]) -> A | {error, _Err} | list(). unwrap_erpc(Res) when is_list(Res) -> diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl index 4419873d6..f38a9099e 100644 --- a/apps/emqx_conf/src/emqx_conf_schema.erl +++ b/apps/emqx_conf/src/emqx_conf_schema.erl @@ -774,12 +774,13 @@ fields("rpc") -> desc => ?DESC(rpc_ssl_server_port) } )}, - {"tcp_client_num", + {"client_num", sc( range(1, 256), #{ + aliases => [tcp_client_num] default => 10, - desc => ?DESC(rpc_tcp_client_num) + desc => ?DESC(rpc_client_num) } )}, {"connect_timeout", diff --git a/rel/i18n/emqx_conf_schema.hocon b/rel/i18n/emqx_conf_schema.hocon index cb593779e..a9a28ce21 100644 --- a/rel/i18n/emqx_conf_schema.hocon +++ b/rel/i18n/emqx_conf_schema.hocon @@ -383,10 +383,10 @@ log_burst_limit_max_count.desc: log_burst_limit_max_count.label: """Events Number""" -rpc_tcp_client_num.desc: +rpc_client_num.desc: """Set the maximum number of RPC communication channels initiated by this node to each remote node.""" -rpc_tcp_client_num.label: +rpc_client_num.label: """RPC TCP Client Num""" cluster_k8s_address_type.desc: