diff options
| author | Michael Klishin <michael@novemberain.com> | 2017-10-12 14:15:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-12 14:15:49 +0100 |
| commit | 7a37407b3f0ee6f53052ba3e40d698dd631471fb (patch) | |
| tree | 660a5612b0e55b535c7703f8295d21e8a03ed5eb | |
| parent | 2a57ce402353f643b340e01c44d66a34255275c9 (diff) | |
| parent | b7840cf5ef6a0e92afd44fd8a651f8f948505a44 (diff) | |
| download | rabbitmq-server-git-7a37407b3f0ee6f53052ba3e40d698dd631471fb.tar.gz | |
Merge pull request #1389 from rabbitmq/rabbitmq-common-224
Update default node memory calculation strategy to match rabbitmq/rabbitmq-common#224
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | docs/rabbitmq.config.example | 8 |
2 files changed, 5 insertions, 5 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 9383af4a26..15018ac0e9 100644 --- a/docs/rabbitmq.config.example +++ b/docs/rabbitmq.config.example @@ -262,10 +262,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. |