diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-11-23 17:40:09 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-11-23 17:40:09 +0000 |
| commit | 400f210f9a4c8bc92b5f1953ac3b4f637dca0671 (patch) | |
| tree | a1f50ee87f78edd38d0c5467b22c21ffe368f7d9 | |
| parent | 7cc0fb90160eb7afcb89c687e83b3a5192dc44bd (diff) | |
| download | rabbitmq-server-bug22692.tar.gz | |
It's rather crucial to call reduce_memory_use at the end of publish_delivered if we've added to the acks. Also reorder items in backing_queue_status so that they fit better on my 160-char wide xterms. It's also a bit more logicalbug22692
| -rw-r--r-- | src/rabbit_variable_queue.erl | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index e9910a56..5ac042a2 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -521,10 +521,11 @@ publish_delivered(true, Msg = #basic_message { is_persistent = IsPersistent }, {MsgStatus1, State1} = maybe_write_to_disk(false, false, MsgStatus, State), State2 = record_pending_ack(m(MsgStatus1), State1), PCount1 = PCount + one_if(IsPersistent1), - {SeqId, a(State2 #vqstate { next_seq_id = SeqId + 1, - out_counter = OutCount + 1, - in_counter = InCount + 1, - persistent_count = PCount1 })}. + {SeqId, a(reduce_memory_use( + State2 #vqstate { next_seq_id = SeqId + 1, + out_counter = OutCount + 1, + in_counter = InCount + 1, + persistent_count = PCount1 }))}. dropwhile(Pred, State) -> {_OkOrEmpty, State1} = dropwhile1(Pred, State), @@ -825,17 +826,17 @@ status(#vqstate { q1 = Q1, q2 = Q2, delta = Delta, q3 = Q3, q4 = Q4, {q4 , queue:len(Q4)}, {len , Len}, {pending_acks , dict:size(PA)}, - {ram_ack_count , gb_trees:size(RAI)}, {outstanding_txns , length(From)}, {target_ram_item_count , TargetRamItemCount}, {ram_msg_count , RamMsgCount}, + {ram_ack_count , gb_trees:size(RAI)}, {ram_index_count , RamIndexCount}, {next_seq_id , NextSeqId}, {persistent_count , PersistentCount}, - {avg_egress_rate , AvgEgressRate}, {avg_ingress_rate , AvgIngressRate}, - {avg_ack_egress_rate , AvgAckEgressRate}, - {avg_ack_ingress_rate , AvgAckIngressRate}]. + {avg_egress_rate , AvgEgressRate}, + {avg_ack_ingress_rate , AvgAckIngressRate}, + {avg_ack_egress_rate , AvgAckEgressRate} ]. %%---------------------------------------------------------------------------- %% Minor helpers |