diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2014-03-10 12:09:18 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2014-03-10 12:09:18 +0000 |
| commit | 1d495f786513397a7f2ae4a93fc7c4803211c602 (patch) | |
| tree | 529af216c49dda912a3cbad86e3978ae3b11277a /src | |
| parent | 1b1582f839c13614925158397f1e9f0562357882 (diff) | |
| download | rabbitmq-server-git-1d495f786513397a7f2ae4a93fc7c4803211c602.tar.gz | |
Fix memory calculations: we were erroneously removing the mgmt db from the plugins bucket (although it was never counted there) and not removing it from the 'other plugins' bucket (although it was).
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_vm.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl index 597f909414..18d8eb4520 100644 --- a/src/rabbit_vm.erl +++ b/src/rabbit_vm.erl @@ -43,13 +43,12 @@ memory() -> {Sums, _Other} = sum_processes(lists:append(All), [memory]), - [Conns, Qs, MsgIndexProc, MgmtDbProc, AllPlugins] = + [Conns, Qs, MsgIndexProc, MgmtDbProc, Plugins] = [aggregate_memory(Names, Sums) || Names <- All], Mnesia = mnesia_memory(), MsgIndexETS = ets_memory(rabbit_msg_store_ets_index), MgmtDbETS = ets_memory(rabbit_mgmt_db), - Plugins = AllPlugins - MgmtDbProc, [{total, Total}, {processes, Processes}, @@ -60,7 +59,7 @@ memory() -> {system, System}] = erlang:memory([total, processes, ets, atom, binary, code, system]), - OtherProc = Processes - Conns - Qs - MsgIndexProc - AllPlugins, + OtherProc = Processes - Conns - Qs - MsgIndexProc - Plugins - MgmtDbProc, [{total, Total}, {connection_procs, Conns}, |