diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2015-12-09 08:04:29 -0800 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2015-12-09 08:04:29 -0800 |
| commit | 99c68002bfd87e5ee1a08dee0c777832f39f95af (patch) | |
| tree | bed97fff8666cc204ea6698ad664a16c3c92fa10 /docs | |
| parent | 81834de912bce65f5a3cd9a77b9e137a8cef0570 (diff) | |
| parent | 497ad281afc4af593e5bfacf53100e3da6cb1c76 (diff) | |
| download | rabbitmq-server-git-99c68002bfd87e5ee1a08dee0c777832f39f95af.tar.gz | |
Merge branch 'master' into rabbitmq-server-479
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/rabbitmqctl.1.xml | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml index b9e478cb53..fb4959b276 100644 --- a/docs/rabbitmqctl.1.xml +++ b/docs/rabbitmqctl.1.xml @@ -1966,8 +1966,8 @@ <listitem><para> The new memory limit at which flow control is triggered, expressed in bytes as an integer number - greater than or equal to 0 or as string with memory unit - (e.g. 1024MB). Available units are: + greater than or equal to 0 or as a string with memory units + (e.g. 512M or 1G). Available units are: k, kiB: kibibytes (2^10 bytes) M, MiB: mebibytes (2^20) G, GiB: gibibytes (2^30) @@ -1979,6 +1979,36 @@ </variablelist> </listitem> </varlistentry> + <varlistentry> + <term><cmdsynopsis><command>set_disk_free_limit</command> <arg choice="req"><replaceable>disk_limit</replaceable></arg></cmdsynopsis></term> + <listitem> + <variablelist> + <varlistentry> + <term>disk_limit</term> + <listitem><para> + Lower bound limit as an integer in bytes or a string with memory units (see vm_memory_high_watermark), + e.g. 512M or 1G. Once free disk space reaches the limit, a disk alarm will be set. + </para></listitem> + </varlistentry> + </variablelist> + </listitem> + </varlistentry> + <varlistentry> + <term><cmdsynopsis><command>set_disk_free_limit mem_relative</command> <arg choice="req"><replaceable>fraction</replaceable></arg></cmdsynopsis></term> + <listitem> + <variablelist> + <varlistentry> + <term>fraction</term> + <listitem><para> + Limit relative to the total amount available RAM + as a non-negative floating point number. + Values lower than 1.0 can be dangerous and + should be used carefully. + </para></listitem> + </varlistentry> + </variablelist> + </listitem> + </varlistentry> </variablelist> </refsect2> </refsect1> |