diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2017-10-12 08:11:03 -0700 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2017-10-12 08:15:54 -0700 |
| commit | f678d1ba15375b56689d10c6eee4e09177cc5ac4 (patch) | |
| tree | e742e57ad8cbeba8e7d9e12fcce20bdbc954975e /priv/schema | |
| parent | 50b978f411e514d6fb41eb6e87020da1498e25d7 (diff) | |
| download | rabbitmq-server-git-f678d1ba15375b56689d10c6eee4e09177cc5ac4.tar.gz | |
Add additional vm_memory_calculation_strategy values to cuttlefish conf
Requires rabbitmq/rabbitmq-common#224
Diffstat (limited to 'priv/schema')
| -rw-r--r-- | priv/schema/rabbit.schema | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema index 38edd6e1ca..dcf49e0c3e 100644 --- a/priv/schema/rabbit.schema +++ b/priv/schema/rabbit.schema @@ -686,13 +686,13 @@ end}. {mapping, "memory_monitor_interval", "rabbit.memory_monitor_interval", [{datatype, integer}]}. -%% When set to rss, RabbitMQ will display the memory usage as reported -%% by the operating system (RSS value), not by the Erlang VM. +%% Selects Erlang VM memory consumption calculation strategy. +%% Can be `allocated`, `rss` or `legacy` (aliased as `erlang`). %% -%% {vm_memory_calculation_strategy, rss}, +%% {vm_memory_calculation_strategy, allocated}, {mapping, "vm_memory_calculation_strategy", "rabbit.vm_memory_calculation_strategy", - [{datatype, {enum, [rss, erlang]}}]}. + [{datatype, {enum, [rss, erlang, allocated, legacy]}}]}. %% Set disk free limit (in bytes). Once free disk space reaches this %% lower bound, a disk alarm will be set - see the documentation |