Skip to content

Update default node memory calculation strategy to match rabbitmq/rabbitmq-common#224 #1389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2017
Merged

Update default node memory calculation strategy to match rabbitmq/rabbitmq-common#224 #1389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
8 changes: 4 additions & 4 deletions docs/rabbitmq.config.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down