summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bakken <lbakken@pivotal.io>2017-10-18 14:46:04 -0700
committerLuke Bakken <lbakken@pivotal.io>2017-10-18 14:46:04 -0700
commit5e711cecdaee61c503e72a2abc7437cf2db26d53 (patch)
treef117863d53eb64251463b97af38140aa9c25a5d3
parent1cbfd896d184f6f9cf7af0cca9ae63f77b2504dd (diff)
downloadrabbitmq-server-git-5e711cecdaee61c503e72a2abc7437cf2db26d53.tar.gz
Default mem calc strategy should be "rss"
This is due to a scenario in which the Erlang VM allocator stats report a huge increase in memory consumption which is only reflected in VSS increase, not RSS PT #152081051
-rw-r--r--Makefile2
-rw-r--r--priv/schema/rabbit.schema2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 45720697b8..16fb2175bc 100644
--- a/Makefile
+++ b/Makefile
@@ -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, allocated},
+ {vm_memory_calculation_strategy, rss},
{memory_monitor_interval, 2500},
{disk_free_limit, 50000000}, %% 50MB
{msg_store_index_module, rabbit_msg_store_ets_index},
diff --git a/priv/schema/rabbit.schema b/priv/schema/rabbit.schema
index dcf49e0c3e..734a8a4102 100644
--- a/priv/schema/rabbit.schema
+++ b/priv/schema/rabbit.schema
@@ -689,7 +689,7 @@ end}.
%% Selects Erlang VM memory consumption calculation strategy.
%% Can be `allocated`, `rss` or `legacy` (aliased as `erlang`).
%%
-%% {vm_memory_calculation_strategy, allocated},
+%% {vm_memory_calculation_strategy, rss},
{mapping, "vm_memory_calculation_strategy", "rabbit.vm_memory_calculation_strategy",
[{datatype, {enum, [rss, erlang, allocated, legacy]}}]}.