diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2013-06-18 13:33:43 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2013-06-18 13:33:43 +0100 |
| commit | 8a42493141070e7dd86430f371064dda900dc973 (patch) | |
| tree | cc53ef1aaeb9da4b51ece005a0f27b5517b81639 | |
| parent | 413dd11bda0b1c06f3577f555094859777fe016e (diff) | |
| download | rabbitmq-server-git-8a42493141070e7dd86430f371064dda900dc973.tar.gz | |
Matthias convinced me to go with ratio-of-a-ratio.
| -rw-r--r-- | ebin/rabbit_app.in | 2 | ||||
| -rw-r--r-- | src/rabbit_memory_monitor.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ebin/rabbit_app.in b/ebin/rabbit_app.in index b28214aff0..46ed24f96a 100644 --- a/ebin/rabbit_app.in +++ b/ebin/rabbit_app.in @@ -19,7 +19,7 @@ {ssl_listeners, []}, {ssl_options, []}, {vm_memory_high_watermark, 0.4}, - {vm_memory_paging_watermark, 0.2}, + {vm_memory_high_watermark_paging_ratio, 0.5}, {disk_free_limit, 1000000000}, %% 1GB {msg_store_index_module, rabbit_msg_store_ets_index}, {backing_queue_module, rabbit_variable_queue}, diff --git a/src/rabbit_memory_monitor.erl b/src/rabbit_memory_monitor.erl index a2df255cae..d47b6e30f3 100644 --- a/src/rabbit_memory_monitor.erl +++ b/src/rabbit_memory_monitor.erl @@ -197,8 +197,8 @@ internal_update(State = #state { queue_durations = Durations, queue_duration_sum = Sum, queue_duration_count = Count }) -> {ok, LimitThreshold} = - application:get_env(rabbit, vm_memory_paging_watermark), - MemoryRatio = erlang:memory(total) / vm_memory_monitor:get_total_memory(), + application:get_env(rabbit, vm_memory_high_watermark_paging_ratio), + MemoryRatio = erlang:memory(total) / vm_memory_monitor:get_memory_limit(), DesiredDurationAvg1 = if MemoryRatio =:= infinity -> 0.0; |