diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-10-12 19:43:25 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-10-12 19:43:25 +0300 |
| commit | 7e727be95f1c15111547c3f713f3985d8015c2cb (patch) | |
| tree | 4dbf4241adc756bc96dc3c1be01c5cc511513de4 | |
| parent | 2fee330fb67ab2de2582298c407cd66ed4319dfb (diff) | |
| parent | 9a7e4e61ec625f6cd7919eb36d76dae2b73ea927 (diff) | |
| download | rabbitmq-server-git-7e727be95f1c15111547c3f713f3985d8015c2cb.tar.gz | |
Merge branch 'rabbitmq-common-224-master-lrb'
| -rw-r--r-- | docs/rabbitmq.conf.example | 8 | ||||
| -rw-r--r-- | priv/schema/rabbit.schema | 8 | ||||
| -rw-r--r-- | test/config_schema_SUITE_data/rabbit.snippets | 8 |
3 files changed, 16 insertions, 8 deletions
diff --git a/docs/rabbitmq.conf.example b/docs/rabbitmq.conf.example index eb45bffbf5..92bce4a1fd 100644 --- a/docs/rabbitmq.conf.example +++ b/docs/rabbitmq.conf.example @@ -267,10 +267,10 @@ ## # vm_memory_high_watermark_paging_ratio = 0.5 -## Selects Erlang VM memory consumption calculation strategy. Can be `rss` or `erlang`, -## `rss` is the default. Introduced in 3.6.11. -## See https://github.com/rabbitmq/rabbitmq-server/issues/1223 for background. -# vm_memory_calculation_strategy = rss +## Selects Erlang VM memory consumption calculation strategy. Can be `allocated`, `rss` or `legacy` (aliased as `erlang`), +## Introduced in 3.6.11. `allocated` is the default as of 3.6.13. +## See https://github.com/rabbitmq/rabbitmq-server/issues/1223 and rabbitmq/rabbitmq-common#224 for background. +# vm_memory_calculation_strategy = allocated ## Interval (in milliseconds) at which we perform the check of the memory ## levels against the watermarks. 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 diff --git a/test/config_schema_SUITE_data/rabbit.snippets b/test/config_schema_SUITE_data/rabbit.snippets index 52babbd34a..233eb8a55b 100644 --- a/test/config_schema_SUITE_data/rabbit.snippets +++ b/test/config_schema_SUITE_data/rabbit.snippets @@ -143,6 +143,14 @@ tcp_listen_options.exit_on_close = false", [{rabbit, [{vm_memory_calculation_strategy, erlang}]}], []}, + {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = allocated", + [{rabbit, + [{vm_memory_calculation_strategy, allocated}]}], + []}, + {vm_memory_calculation_strategy, "vm_memory_calculation_strategy = legacy", + [{rabbit, + [{vm_memory_calculation_strategy, legacy}]}], + []}, {listeners_tcp_ip, "listeners.tcp.1 = 192.168.1.99:5672", [{rabbit,[{tcp_listeners,[{"192.168.1.99",5672}]}]}], |