diff options
| author | Michael Klishin <michael@novemberain.com> | 2016-05-23 16:36:03 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@novemberain.com> | 2016-05-23 16:36:03 +0300 |
| commit | 918cb78abc9c0fa91a6be1182cacf350ee5596ae (patch) | |
| tree | 5b6ed331ea5798ecbf9f4e18738b0f690cce4ba2 /src | |
| parent | 1aa116591bb09b41f1f5f898e0e2748715802ff3 (diff) | |
| parent | 2b9bdfd73b7157cbce9ece636d05f6916d5a3a5a (diff) | |
| download | rabbitmq-server-git-918cb78abc9c0fa91a6be1182cacf350ee5596ae.tar.gz | |
Merge pull request #806 from rabbitmq/rabbitmq-server-687
Use AckRequired in drop_one as priority queues return tuples {Priority, AckTag}
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index e447e9de82..8246fcea7e 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -363,7 +363,7 @@ fetch(AckRequired, State = #state { backing_queue = BQ, State1 = State #state { backing_queue_state = BQS1 }, {Result, case Result of empty -> State1; - {_MsgId, _IsDelivered, AckTag} -> drop_one(AckTag, State1) + {_MsgId, _IsDelivered, _AckTag} -> drop_one(AckRequired, State1) end}. drop(AckRequired, State = #state { backing_queue = BQ, @@ -372,7 +372,7 @@ drop(AckRequired, State = #state { backing_queue = BQ, State1 = State #state { backing_queue_state = BQS1 }, {Result, case Result of empty -> State1; - {_MsgId, AckTag} -> drop_one(AckTag, State1) + {_MsgId, _AckTag} -> drop_one(AckRequired, State1) end}. ack(AckTags, State = #state { gm = GM, @@ -556,10 +556,10 @@ depth_fun() -> %% Helpers %% --------------------------------------------------------------------------- -drop_one(AckTag, State = #state { gm = GM, - backing_queue = BQ, - backing_queue_state = BQS }) -> - ok = gm:broadcast(GM, {drop, BQ:len(BQS), 1, AckTag =/= undefined}), +drop_one(AckRequired, State = #state { gm = GM, + backing_queue = BQ, + backing_queue_state = BQS }) -> + ok = gm:broadcast(GM, {drop, BQ:len(BQS), 1, AckRequired}), State. drop(PrevLen, AckRequired, State = #state { gm = GM, |