diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-11-24 21:54:25 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-11-24 21:54:25 +0300 |
| commit | 6f70dcbe05dbba35f7d950674d293a4c7d867d44 (patch) | |
| tree | 3ea3a7ec0546d59a00364654a2885b0e6a07b335 | |
| parent | 8b5a89209f1b01c7d7a650eadee91746443314b1 (diff) | |
| parent | d173fd774a28490eb5e4a66a588d92c0c95540fe (diff) | |
| download | rabbitmq-server-git-6f70dcbe05dbba35f7d950674d293a4c7d867d44.tar.gz | |
Merge branch 'stable'
Conflicts:
test/src/rabbit_tests.erl
| -rw-r--r-- | docs/rabbitmq.config.example | 4 | ||||
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 6 | ||||
| -rw-r--r-- | src/rabbit_control_main.erl | 2 | ||||
| -rw-r--r-- | src/vm_memory_monitor.erl | 3 |
4 files changed, 7 insertions, 8 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example index 6be9504b8b..ef9b247f03 100644 --- a/docs/rabbitmq.config.example +++ b/docs/rabbitmq.config.example @@ -193,9 +193,9 @@ %% %% {vm_memory_high_watermark, 0.4}, - %% Alternatively, we can set a limit (in megabytes) of RAM used by the node. + %% Alternatively, we can set a limit (in bytes) of RAM used by the node. %% - %% {vm_memory_high_watermark, {absolute, 1024}}, + %% {vm_memory_high_watermark, {absolute, 1073741824}}, %% Fraction of the high watermark limit at which queues start to %% page message out to disc in order to free up memory. diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index b60e4f02ab..885e3c4dd2 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -1958,14 +1958,14 @@ </listitem> </varlistentry> <varlistentry> - <term><cmdsynopsis><command>set_vm_memory_high_watermark absolute</command> <arg choice="req"><replaceable>memory_limit_mb</replaceable></arg></cmdsynopsis></term> + <term><cmdsynopsis><command>set_vm_memory_high_watermark absolute</command> <arg choice="req"><replaceable>memory_limit_in_bytes</replaceable></arg></cmdsynopsis></term> <listitem> <variablelist> <varlistentry> - <term>memory_limit_mb</term> + <term>memory_limit_in_bytes</term> <listitem><para> The new memory limit at which flow control is - triggered, expressed in MB as an integer number + triggered, expressed in bytes as an integer number greater than or equal to 0. </para></listitem> </varlistentry> diff --git a/src/rabbit_control_main.erl b/src/rabbit_control_main.erl index 5d061252d0..d21f60a440 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). |