diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-10-11 07:06:57 +0100 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-10-12 19:31:45 +0300 |
| commit | 2fee330fb67ab2de2582298c407cd66ed4319dfb (patch) | |
| tree | f9c4f04c1ce3ad19beee931f2aca9e2a6f54ff3f | |
| parent | 3f1a4c6fae7dcd97a96f6aa9670cc66bc0651dd3 (diff) | |
| download | rabbitmq-server-git-2fee330fb67ab2de2582298c407cd66ed4319dfb.tar.gz | |
Update default allocator strategy to match rabbitmq/rabbitmq-common#224
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | docs/rabbitmq.config.example | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -16,7 +16,7 @@ define PROJECT_ENV {ssl_options, []}, {vm_memory_high_watermark, 0.4}, {vm_memory_high_watermark_paging_ratio, 0.5}, - {vm_memory_calculation_strategy, rss}, + {vm_memory_calculation_strategy, allocated}, {memory_monitor_interval, 2500}, {disk_free_limit, 50000000}, %% 50MB {msg_store_index_module, rabbit_msg_store_ets_index}, diff --git a/docs/rabbitmq.config.example b/docs/rabbitmq.config.example index 60af5b7eea..0882764a3a 100644 --- a/docs/rabbitmq.config.example +++ b/docs/rabbitmq.config.example @@ -258,11 +258,11 @@ %% %% {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. %% |