diff options
| -rw-r--r-- | src/rabbit_memory_monitor.erl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/rabbit_memory_monitor.erl b/src/rabbit_memory_monitor.erl index 2e9a820cb2..4f8202cdad 100644 --- a/src/rabbit_memory_monitor.erl +++ b/src/rabbit_memory_monitor.erl @@ -236,10 +236,10 @@ desired_duration_average(#state{queue_duration_sum = Sum, (Sum / Count) / MemoryRatio end. +%% In normal use, we only inform queues immediately if the desired +%% duration has decreased, we want to ensure timely paging. maybe_inform_queues(false, DesiredDurationAvg, DesiredDurationAvg1, Durations) -> - %% only inform queues immediately if the desired duration has - %% decreased case DesiredDurationAvg1 == infinity orelse (DesiredDurationAvg /= infinity andalso DesiredDurationAvg1 >= DesiredDurationAvg) of @@ -247,6 +247,9 @@ maybe_inform_queues(false, DesiredDurationAvg, DesiredDurationAvg1, false -> inform_queues(DesiredDurationAvg1, Durations, fun should_send/3) end; +%% When the disk alarm has gone off though, we want to inform queues +%% immediately if the desired duration has *increased* - we want to +%% ensure timely stopping paging. maybe_inform_queues(true, DesiredDurationAvg, DesiredDurationAvg1, Durations) -> case DesiredDurationAvg1 == infinity andalso |