diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-10-03 15:03:55 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-10-03 15:03:55 +0300 |
| commit | 5269729a57b8b0b2a74e03d561a8ea6818b38d0c (patch) | |
| tree | 4dfc151dc25e993e9f65aa4b1fae1fd58197bc29 | |
| parent | 7e64d485e196c1791df6eff07940a6c5f368a7a0 (diff) | |
| parent | 3f96e9b69191f7c08bfa0b6f22cf30b82de9a006 (diff) | |
| download | rabbitmq-server-git-5269729a57b8b0b2a74e03d561a8ea6818b38d0c.tar.gz | |
Merge branch 'stable'
| -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 ac3d60bb11..2c6628cfe8 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -829,7 +829,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, @@ -911,7 +911,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 } }) -> |