summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/rabbitmq-server2
-rw-r--r--src/rabbit_memory_monitor.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server
index 34904850be..2a1e48efd8 100755
--- a/scripts/rabbitmq-server
+++ b/scripts/rabbitmq-server
@@ -109,7 +109,7 @@ exec erl \
-os_mon start_cpu_sup true \
-os_mon start_disksup false \
-os_mon start_memsup false \
- -os_mon vm_memory_high_watermark 0.4 \
+ -os_mon vm_memory_high_watermark 0.2 \
-mnesia dir "\"${RABBITMQ_MNESIA_DIR}\"" \
${RABBITMQ_CLUSTER_CONFIG_OPTION} \
${RABBITMQ_SERVER_START_ARGS} \
diff --git a/src/rabbit_memory_monitor.erl b/src/rabbit_memory_monitor.erl
index 99becb57da..0b6ad5c78a 100644
--- a/src/rabbit_memory_monitor.erl
+++ b/src/rabbit_memory_monitor.erl
@@ -241,7 +241,7 @@ internal_update(State = #state{memory_limit = Limit,
DesiredDurationAvg1 =
case AvgDuration == infinity orelse MemoryRatio > 2 of
true -> infinity;
- false -> lists:max([0, trunc(AvgDuration * MemoryRatio)])
+ false -> lists:max([0, AvgDuration * MemoryRatio])
end,
State1 = State#state{memory_ratio = MemoryRatio,
desired_duration = DesiredDurationAvg1},