diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2016-06-27 16:07:53 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2016-06-27 16:07:53 +0300 |
| commit | c824c9dd19341cdd0e8a48ff02d846abf9c9c313 (patch) | |
| tree | 6acfdf3e23bc7a1da93ebb8a2f5db48a5e26ce09 | |
| parent | a62865540cf6f0a55ad22a455c0c9f88597d43ea (diff) | |
| parent | ebd33bab54474ea13653a2861314e93151aad4bc (diff) | |
| download | rabbitmq-server-git-c824c9dd19341cdd0e8a48ff02d846abf9c9c313.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit_variable_queue.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 5b86cbd3d1..b928bffa74 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -556,7 +556,7 @@ delete_crashed(#amqqueue{name = QName}) -> ok = rabbit_queue_index:erase(QName). purge(State = #vqstate { len = Len }) -> - case is_pending_ack_empty(State) of + case is_pending_ack_empty(State) and is_unconfirmed_empty(State) of true -> {Len, purge_and_index_reset(State)}; false -> @@ -1648,6 +1648,9 @@ reset_qi_state(State = #vqstate{index_state = IndexState}) -> is_pending_ack_empty(State) -> count_pending_acks(State) =:= 0. +is_unconfirmed_empty(#vqstate { unconfirmed = UC }) -> + gb_sets:is_empty(UC). + count_pending_acks(#vqstate { ram_pending_ack = RPA, disk_pending_ack = DPA, qi_pending_ack = QPA }) -> |