diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-10-23 01:23:53 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-10-23 01:23:53 +0300 |
| commit | ad461b30e9c0104277dff7ec937354d1fc1e64d5 (patch) | |
| tree | 7bd77f399c15b91b2cb319d8ec9dae10cd40ef6d /docs | |
| parent | 2bc39429a943957d64b29a1c7a70a8e787e2cd18 (diff) | |
| parent | 1474424ed873b756438bc6a1a3e0fcebb8e9c958 (diff) | |
| download | rabbitmq-server-git-ad461b30e9c0104277dff7ec937354d1fc1e64d5.tar.gz | |
Merge branch 'stable'
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/rabbitmq.config.example | 4 | ||||
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 15 |
2 files changed, 19 insertions, 0 deletions
diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example index dd1a4e6c87..6be9504b8b 100644 --- a/docs/rabbitmq.config.example +++ b/docs/rabbitmq.config.example @@ -193,6 +193,10 @@ %% %% {vm_memory_high_watermark, 0.4}, + %% Alternatively, we can set a limit (in megabytes) of RAM used by the node. + %% + %% {vm_memory_high_watermark, {absolute, 1024}}, + %% 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 74ef71108e..43d00418e6 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -1930,6 +1930,21 @@ </variablelist> </listitem> </varlistentry> + <varlistentry> + <term><cmdsynopsis><command>set_vm_memory_high_watermark absolute</command> <arg choice="req"><replaceable>memory_limit_mb</replaceable></arg></cmdsynopsis></term> + <listitem> + <variablelist> + <varlistentry> + <term>memory_limit_mb</term> + <listitem><para> + The new memory limit at which flow control is + triggered, expressed in MB as an integer number + greater than or equal to 0. + </para></listitem> + </varlistentry> + </variablelist> + </listitem> + </varlistentry> </variablelist> </refsect2> </refsect1> |