diff options
| author | Emile Joubert <emile@rabbitmq.com> | 2013-05-29 15:45:54 +0100 |
|---|---|---|
| committer | Emile Joubert <emile@rabbitmq.com> | 2013-05-29 15:45:54 +0100 |
| commit | ef21df62c9d6cf25d95ea5410c1de66912e27d9c (patch) | |
| tree | 2597312585178b338129a655abf4623baebd3a63 | |
| parent | 8728a5c3dd93e662f1fb6ecee56e184493243de4 (diff) | |
| download | rabbitmq-server-bug25567.tar.gz | |
Dehydrate prospective betas on requeuebug25567
| -rw-r--r-- | src/rabbit_variable_queue.erl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index f7c6c729..5b39c2c6 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -1363,11 +1363,8 @@ publish_alpha(MsgStatus, State) -> {MsgStatus, inc_ram_msg_count(State)}. publish_beta(MsgStatus, State) -> - {#msg_status { msg = Msg} = MsgStatus1, - #vqstate { ram_msg_count = RamMsgCount } = State1} = - maybe_write_to_disk(true, false, MsgStatus, State), - {MsgStatus1, State1 #vqstate { - ram_msg_count = RamMsgCount + one_if(Msg =/= undefined) }}. + {MsgStatus1, State1} = maybe_write_to_disk(true, false, MsgStatus, State), + {m(trim_msg_status(MsgStatus1)), State1}. %% Rebuild queue, inserting sequence ids to maintain ordering queue_merge(SeqIds, Q, MsgIds, Limit, PubFun, State) -> |