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

Merge pull request #8324 from zmstone/0626-fix-mem-stats 

chore: return system total and used memory in node_info
This commit is contained in:
Zaiming (Stone) Shi 2022-06-27 07:04:45 +01:00 committed by GitHub
parent 5e3e5a5ffa c4f1c83003
commit 9af4cb75ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/emqx_management/src/emqx_mgmt.erl
View File

@ -136,13 +136,13 @@ list_nodes() ->
lookup_node(Node) -> node_info(Node). lookup_node(Node) -> node_info(Node).
node_info(Node) when Node =:= node() -> node_info(Node) when Node =:= node() ->
Memory = emqx_vm:get_memory(), {UsedRatio, Total} = get_sys_memory(),
Info = maps:from_list([{K, list_to_binary(V)} || {K, V} <- emqx_vm:loads()]), Info = maps:from_list([{K, list_to_binary(V)} || {K, V} <- emqx_vm:loads()]),
BrokerInfo = emqx_sys:info(), BrokerInfo = emqx_sys:info(),
Info#{node => node(), Info#{node => node(),
otp_release => iolist_to_binary(otp_rel()), otp_release => iolist_to_binary(otp_rel()),
memory_total => proplists:get_value(allocated, Memory), memory_total => Total,
memory_used => proplists:get_value(used, Memory), memory_used => erlang:round(Total * UsedRatio),
process_available => erlang:system_info(process_limit), process_available => erlang:system_info(process_limit),
process_used => erlang:system_info(process_count), process_used => erlang:system_info(process_count),
max_fds => max_fds =>
@ -156,6 +156,14 @@ node_info(Node) when Node =:= node() ->
node_info(Node) -> node_info(Node) ->
rpc_call(Node, node_info, [Node]). rpc_call(Node, node_info, [Node]).
get_sys_memory() ->
case os:type() of
{unix, linux} ->
load_ctl:get_sys_memory();
_ ->
{0, 0}
end.
stopped_node_info(Node) -> stopped_node_info(Node) ->
#{name => Node, node_status => 'Stopped'}. #{name => Node, node_status => 'Stopped'}.