Skip to content

Commit e32c7d3

Browse files
Update default allocator strategy to match rabbitmq/rabbitmq-common#224
1 parent 828a978 commit e32c7d3

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ define PROJECT_ENV
1616
{ssl_options, []},
1717
{vm_memory_high_watermark, 0.4},
1818
{vm_memory_high_watermark_paging_ratio, 0.5},
19-
{vm_memory_calculation_strategy, rss},
19+
{vm_memory_calculation_strategy, allocated},
2020
{memory_monitor_interval, 2500},
2121
{disk_free_limit, 50000000}, %% 50MB
2222
{msg_store_index_module, rabbit_msg_store_ets_index},

docs/rabbitmq.config.example

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,11 +258,11 @@
258258
%%
259259
%% {vm_memory_high_watermark_paging_ratio, 0.5},
260260

261-
%% Selects Erlang VM memory consumption calculation strategy. Can be `rss` or `erlang`,
262-
%% `rss` is the default. Introduced in 3.6.11.
263-
%% See https://github.com/rabbitmq/rabbitmq-server/issues/1223 for background.
264-
%% {vm_memory_calculation_strategy, rss},
265-
261+
%% Selects Erlang VM memory consumption calculation strategy. Can be `allocated`, `rss` or `legacy` (aliased as `erlang`),
262+
%% Introduced in 3.6.11. `allocated` is the default as of 3.6.13.
263+
%% See https://github.com/rabbitmq/rabbitmq-server/issues/1223 and rabbitmq/rabbitmq-common#224 for background.
264+
%% {vm_memory_calculation_strategy, allocated},
265+
266266
%% Interval (in milliseconds) at which we perform the check of the memory
267267
%% levels against the watermarks.
268268
%%

0 commit comments

Comments
 (0)