diff options
| author | Michael Klishin <michael@novemberain.com> | 2017-10-03 15:02:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 15:02:51 +0300 |
| commit | 3f96e9b69191f7c08bfa0b6f22cf30b82de9a006 (patch) | |
| tree | b51465712c10d9d3c1cd734e1f0958ed2d274a7f | |
| parent | 9e7cea3ae6dfb89bc14e562812420ee846486220 (diff) | |
| parent | 89a54cd7f20952875417d5cb16b772abfaaec341 (diff) | |
| download | rabbitmq-server-git-3f96e9b69191f7c08bfa0b6f22cf30b82de9a006.tar.gz | |
Merge pull request #1382 from rabbitmq/rabbitmq-server-1379rabbitmq_v3_6_13_milestone1
Do not limit paging to disk if hibernated or resumed after credit
| -rw-r--r-- | src/rabbit_variable_queue.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index d50490544c..d487286774 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -789,7 +789,7 @@ set_ram_duration_target( (TargetRamCount =/= infinity andalso TargetRamCount1 >= TargetRamCount) of true -> State1; - false -> maybe_reduce_memory_use(State1) + false -> reduce_memory_use(State1) end). maybe_update_rates(State = #vqstate{ in_counter = InCount, @@ -871,7 +871,7 @@ timeout(State = #vqstate { index_state = IndexState }) -> handle_pre_hibernate(State = #vqstate { index_state = IndexState }) -> State #vqstate { index_state = rabbit_queue_index:flush(IndexState) }. -resume(State) -> a(maybe_reduce_memory_use(State)). +resume(State) -> a(reduce_memory_use(State)). msg_rates(#vqstate { rates = #rates { in = AvgIngressRate, out = AvgEgressRate } }) -> |