diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2020-04-28 13:08:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-28 13:08:09 +0300 |
| commit | dc088f3f7a10a7aff743133ac436eda84d877231 (patch) | |
| tree | 27289bbc907265a92fb2fc8dffdde0f1da213be1 /src | |
| parent | 84f2be6012e5be0554eb480143d825aecdccefe5 (diff) | |
| parent | 721e4e99d7b77f34e9e35205a3ad9d2f77baf1bf (diff) | |
| download | rabbitmq-server-git-dc088f3f7a10a7aff743133ac436eda84d877231.tar.gz | |
Merge pull request #2330 from rabbitmq/qq-delivery-limit-bug
QQ: Fix crash bug when reaching delivery limit
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_fifo.erl | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/rabbit_fifo.erl b/src/rabbit_fifo.erl index 940ed0d999..3a0fe2442a 100644 --- a/src/rabbit_fifo.erl +++ b/src/rabbit_fifo.erl @@ -1141,13 +1141,19 @@ return(#{index := IncomingRaftIdx} = Meta, ConsumerId, Returned, return_one(MsgId, MsgNum, Msg, S0, E0, ConsumerId) end, {State0, Effects0}, Returned), - #{ConsumerId := Con0} = Cons0 = State1#?MODULE.consumers, - Con = Con0#consumer{credit = increase_credit(Con0, map_size(Returned))}, - {Cons, SQ, Effects2} = update_or_remove_sub(ConsumerId, Con, Cons0, - SQ0, Effects1), - State2 = State1#?MODULE{consumers = Cons, - service_queue = SQ}, - {State, ok, Effects} = checkout(Meta, State2, Effects2), + {State2, Effects3} = + case State1#?MODULE.consumers of + #{ConsumerId := Con0} = Cons0 -> + Con = Con0#consumer{credit = increase_credit(Con0, + map_size(Returned))}, + {Cons, SQ, Effects2} = update_or_remove_sub(ConsumerId, Con, + Cons0, SQ0, Effects1), + {State1#?MODULE{consumers = Cons, + service_queue = SQ}, Effects2}; + _ -> + {State1, Effects1} + end, + {State, ok, Effects} = checkout(Meta, State2, Effects3), update_smallest_raft_index(IncomingRaftIdx, State, Effects). % used to processes messages that are finished |