diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2014-03-03 15:07:54 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2014-03-03 15:07:54 +0000 |
| commit | fdc089a4979b1d47c04c1ae4cf67c9a03c9c85bf (patch) | |
| tree | ae8a8f367cf10a3d4ef163911da8cb7455994845 | |
| parent | 3a3a22768e6002098ca99f5feb6429f9d9e764f5 (diff) | |
| download | rabbitmq-server-bug26049.tar.gz | |
clamp duration to infinity when all rates are very lowbug26049
...so that the memory monitor excludes the queue from avg duration
calculations, which would otherwise get massively skewed.
| -rw-r--r-- | src/rabbit_variable_queue.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 73e9f6b5..995c7319 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -801,8 +801,9 @@ ram_duration(State) -> RamAckCount = gb_trees:size(RPA), Duration = %% msgs+acks / (msgs+acks/sec) == sec - case (AvgEgressRate == 0 andalso AvgIngressRate == 0 andalso - AvgAckEgressRate == 0 andalso AvgAckIngressRate == 0) of + case lists:all(fun (X) -> X < 0.01 end, + [AvgEgressRate, AvgIngressRate, + AvgAckEgressRate, AvgAckIngressRate]) of true -> infinity; false -> (RamMsgCountPrev + RamMsgCount + RamAckCount + RamAckCountPrev) / |