diff options
| author | Luke Bakken <lbakken@pivotal.io> | 2017-06-14 07:31:40 -0700 |
|---|---|---|
| committer | Luke Bakken <lbakken@pivotal.io> | 2017-06-19 10:42:07 -0700 |
| commit | 8e3d3ab47ff01c3c0dd17d424850001bd4f7d13c (patch) | |
| tree | cad93b1a4118860456559fbffe0983751ab9f04d /priv | |
| parent | 22cc2ae68aa1724f51e7e471db0f624b9d5195dd (diff) | |
| download | rabbitmq-server-git-8e3d3ab47ff01c3c0dd17d424850001bd4f7d13c.tar.gz | |
add memory_monitor_interval test
fix memory_monitor_interval test
Add vm_memory_use_process_rss setting and tests
Use vm_memory_calculation_strategy
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/schema/rabbit.schema | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema index 985c77b9a8..e3eff6fb59 100644 --- a/priv/schema/rabbit.schema +++ b/priv/schema/rabbit.schema @@ -683,6 +683,14 @@ 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. +%% +%% {vm_memory_calculation_strategy, rss}, + +{mapping, "vm_memory_calculation_strategy", "rabbit.vm_memory_calculation_strategy", + [{datatype, {enum, [rss, erlang]}}]}. + %% Set disk free limit (in bytes). Once free disk space reaches this %% lower bound, a disk alarm will be set - see the documentation %% listed above for more details. |