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

fix: hide process_limit completely

This commit is contained in:
zhongwencool 2023-07-14 11:04:20 +08:00
parent 924ed06760
commit 131511b10e
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,8 +86,7 @@ roots() ->
sc( sc(
?R_REF("node"), ?R_REF("node"),
#{ #{
translate_to => ["emqx"], translate_to => ["emqx"]
converter => fun node_converter/2
} }
)}, )},
{"cluster", {"cluster",
@ -446,9 +445,11 @@ fields("node") ->
sc( sc(
range(1024, 134217727), range(1024, 134217727),
#{ #{
mapping => "vm_args.+P", %% deprecated make sure it's disappeared in raw_conf user(HTTP API)
%% but still in vm.args via translation/1
%% ProcessLimit is always equal to MaxPort * 2 when translation/1.
deprecated => true,
desc => ?DESC(process_limit), desc => ?DESC(process_limit),
default => ?DEFAULT_MAX_PORTS * 2,
importance => ?IMPORTANCE_HIDDEN, importance => ?IMPORTANCE_HIDDEN,
'readOnly' => true 'readOnly' => true
} }
@ -1052,7 +1053,7 @@ desc("authorization") ->
desc(_) -> desc(_) ->
undefined. undefined.
translations() -> ["ekka", "kernel", "emqx", "gen_rpc", "prometheus"]. translations() -> ["ekka", "kernel", "emqx", "gen_rpc", "prometheus", "vm_args"].
translation("ekka") -> translation("ekka") ->
[{"cluster_discovery", fun tr_cluster_discovery/1}]; [{"cluster_discovery", fun tr_cluster_discovery/1}];
@ -1079,8 +1080,15 @@ translation("prometheus") ->
{"vm_system_info_collector_metrics", fun tr_vm_system_info_collector/1}, {"vm_system_info_collector_metrics", fun tr_vm_system_info_collector/1},
{"vm_memory_collector_metrics", fun tr_vm_memory_collector/1}, {"vm_memory_collector_metrics", fun tr_vm_memory_collector/1},
{"vm_msacc_collector_metrics", fun tr_vm_msacc_collector/1} {"vm_msacc_collector_metrics", fun tr_vm_msacc_collector/1}
];
translation("vm_args") ->
[
{"+P", fun tr_vm_args_process_limit/1}
]. ].
tr_vm_args_process_limit(Conf) ->
2 * conf_get("node.max_ports", Conf, ?DEFAULT_MAX_PORTS).
tr_vm_dist_collector(Conf) -> tr_vm_dist_collector(Conf) ->
metrics_enabled(conf_get("prometheus.vm_dist_collector", Conf, enabled)). metrics_enabled(conf_get("prometheus.vm_dist_collector", Conf, enabled)).
@ -1395,10 +1403,3 @@ ensure_unicode_path(Path, _) when is_list(Path) ->
Path; Path;
ensure_unicode_path(Path, _) -> ensure_unicode_path(Path, _) ->
throw({"not_string", Path}). throw({"not_string", Path}).
node_converter(#{<<"process_limit">> := _} = Conf, _Opts) ->
Conf;
node_converter(#{<<"max_ports">> := MaxPorts} = Conf, _Opts) ->
Conf#{<<"process_limit">> => MaxPorts * 2};
node_converter(Conf, _Opts) ->
Conf.

8
apps/emqx_conf/test/emqx_conf_schema_tests.erl
View File

@ -25,6 +25,8 @@
name = \"emqx1@127.0.0.1\" name = \"emqx1@127.0.0.1\"
cookie = \"emqxsecretcookie\" cookie = \"emqxsecretcookie\"
data_dir = \"data\" data_dir = \"data\"
max_ports = 2048
process_limit = 10240
} }
cluster { cluster {
name = emqxcl name = emqxcl
@ -42,6 +44,12 @@ array_nodes_test() ->
ConfFile = to_bin(?BASE_CONF, [Nodes, Nodes]), ConfFile = to_bin(?BASE_CONF, [Nodes, Nodes]),
{ok, Conf} = hocon:binary(ConfFile, #{format => richmap}), {ok, Conf} = hocon:binary(ConfFile, #{format => richmap}),
ConfList = hocon_tconf:generate(emqx_conf_schema, Conf), ConfList = hocon_tconf:generate(emqx_conf_schema, Conf),
VMArgs = proplists:get_value(vm_args, ConfList),
ProcLimit = proplists:get_value('+P', VMArgs),
MaxPort = proplists:get_value('+Q', VMArgs),
?assertEqual(2048, MaxPort),
?assertEqual(MaxPort * 2, ProcLimit),
ClusterDiscovery = proplists:get_value( ClusterDiscovery = proplists:get_value(
cluster_discovery, proplists:get_value(ekka, ConfList) cluster_discovery, proplists:get_value(ekka, ConfList)
), ),