summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2017-08-25 13:49:20 -0600
committerMichael Klishin <mklishin@pivotal.io>2017-08-25 13:49:20 -0600
commitfd7cd65678597e94e34033dd0dc5148646877e9a (patch)
tree3b64fac4d69fee8e2f09f5ddb94f92e3da16173d
parentd86f10c66d9bfc61a21f957e0cfc2b092a336bb8 (diff)
downloadrabbitmq-server-git-fd7cd65678597e94e34033dd0dc5148646877e9a.tar.gz
Add vm_memory_calculation_strategy to rabbitmq.conf.example
-rw-r--r--docs/rabbitmq.conf.example5
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/rabbitmq.conf.example b/docs/rabbitmq.conf.example
index 094e210377..eb45bffbf5 100644
--- a/docs/rabbitmq.conf.example
+++ b/docs/rabbitmq.conf.example
@@ -267,6 +267,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
+
## Interval (in milliseconds) at which we perform the check of the memory
## levels against the watermarks.
##