diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-11-24 18:12:53 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-11-24 18:12:53 +0300 |
| commit | e07be9a0f52a1c09f6928cb06c27c47f1f3af2bf (patch) | |
| tree | fdcabd8872f76cf0057f82ed01fed9514b8b0f02 /src | |
| parent | 5d45ac7664f82261d9479551e0affe657ede1977 (diff) | |
| download | rabbitmq-server-git-e07be9a0f52a1c09f6928cb06c27c47f1f3af2bf.tar.gz | |
Switch absolute memory watermark values to be in bytes
Fixes #407, references #207, #378, #448.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_control_main.erl | 2 | ||||
| -rw-r--r-- | src/vm_memory_monitor.erl | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 1d98e5a354..53b4d4c6b3 100644 --- a/src/rabbit_control_main.erl +++ b/src/rabbit_control_main.erl @@ -418,7 +418,7 @@ action(set_vm_memory_high_watermark, Node, [Arg], _Opts, Inform) -> action(set_vm_memory_high_watermark, Node, ["absolute", Arg], _Opts, Inform) -> Limit = list_to_integer(Arg), - Inform("Setting memory threshold on ~p to ~pMB", [Node, Limit]), + Inform("Setting memory threshold on ~p to ~p bytes", [Node, Limit]), rpc_call(Node, vm_memory_monitor, set_vm_memory_high_watermark, [{absolute, Limit}]); diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl index 6dab49dd3e..1d98843365 100644 --- a/src/vm_memory_monitor.erl +++ b/src/vm_memory_monitor.erl @@ -216,8 +216,7 @@ set_mem_limits(State, MemLimit) -> memory_config_limit = MemLimit}). interpret_limit({'absolute', MemLim}, UsableMemory) -> - %% Absolute memory is provided in MB - erlang:min(MemLim * ?ONE_MB, UsableMemory); + erlang:min(MemLim, UsableMemory); interpret_limit(MemFraction, UsableMemory) -> trunc(MemFraction * UsableMemory). |