diff options
| -rw-r--r-- | src/rabbit_variable_queue.erl | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 7f4fdb67c6..ea18ef2a2b 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -744,9 +744,9 @@ timeout(State = #vqstate { index_state = IndexState }) -> IndexState1 = rabbit_queue_index:sync(IndexState), State1 = State #vqstate { index_state = IndexState1 }, a(case reduce_memory_use( - fun (_Quota, State1) -> {0, State1} end, - fun (_Quota, State1) -> State1 end, - fun (_Quota, State1) -> {0, State1} end, + fun (_Quota, State2) -> {0, State2} end, + fun (_Quota, State2) -> State2 end, + fun (_Quota, State2) -> {0, State2} end, State) of {true, _State} -> reduce_memory_use(State1); {false, _State} -> State1 @@ -1267,13 +1267,6 @@ find_persistent_count(LensByStore) -> %% Internal plumbing for confirms (aka publisher acks) %%---------------------------------------------------------------------------- -confirm_commit_index(State = #vqstate { index_state = IndexState }) -> - case needs_index_sync(State) of - true -> State #vqstate { - index_state = rabbit_queue_index:sync(IndexState) }; - false -> State - end. - record_confirms(MsgIdSet, State = #vqstate { msgs_on_disk = MOD, msg_indices_on_disk = MIOD, unconfirmed = UC, |