diff options
| author | Michael Klishin <michael@novemberain.com> | 2017-06-19 21:31:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 21:31:54 +0300 |
| commit | bc5048b89ddda79fd12e68247bda58a5691f7f28 (patch) | |
| tree | cad93b1a4118860456559fbffe0983751ab9f04d | |
| parent | 22cc2ae68aa1724f51e7e471db0f624b9d5195dd (diff) | |
| parent | 8e3d3ab47ff01c3c0dd17d424850001bd4f7d13c (diff) | |
| download | rabbitmq-server-git-bc5048b89ddda79fd12e68247bda58a5691f7f28.tar.gz | |
Merge pull request #1265 from rabbitmq/rabbitmq-server-1264
Add vm_memory_calculation_strategy to cuttlefish schema
| -rw-r--r-- | priv/schema/rabbit.schema | 8 | ||||
| -rw-r--r-- | test/config_schema_SUITE_data/rabbit.snippets | 12 |
2 files changed, 20 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. diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets index 69e926100e..03a687db66 100644 --- a/test/config_schema_SUITE_data/rabbit.snippets +++ b/test/config_schema_SUITE_data/rabbit.snippets @@ -131,6 +131,18 @@ tcp_listen_options.exit_on_close = false", [{vm_memory_high_watermark_paging_ratio,0.75}, {vm_memory_high_watermark,0.4}]}], []}, + {memory_monitor_interval, "memory_monitor_interval = 5000", + [{rabbit, + [{memory_monitor_interval, 5000}]}], + []}, + {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = rss", + [{rabbit, + [{vm_memory_calculation_strategy, rss}]}], + []}, + {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = erlang", + [{rabbit, + [{vm_memory_calculation_strategy, erlang}]}], + []}, {listeners_tcp_ip, "listeners.tcp.1 = 192.168.1.99:5672", [{rabbit,[{tcp_listeners,[{"192.168.1.99",5672}]}]}], |