diff options
| author | Alex Thomas <alext@misshelpful> | 2015-02-25 12:02:42 +0000 |
|---|---|---|
| committer | Alex Thomas <alext@lshift.net> | 2015-04-10 17:03:48 +0100 |
| commit | d899179f39172e5ee26918a1d222f240c9087861 (patch) | |
| tree | d0015787a1f4a5c590c4ae05d4e1d920ad730792 /src | |
| parent | f5cf81ede57c7b616f6c14893613a7e58fd983f1 (diff) | |
| download | rabbitmq-server-git-d899179f39172e5ee26918a1d222f240c9087861.tar.gz | |
Move head_msg_timestamp from backing_queue_status property to top-level queue stat as per PR comment #7.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_backing_queue.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_variable_queue.erl | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/rabbit_backing_queue.erl b/src/rabbit_backing_queue.erl index 55c8c971a0..71ad7f5b98 100644 --- a/src/rabbit_backing_queue.erl +++ b/src/rabbit_backing_queue.erl @@ -22,7 +22,7 @@ messages_unacknowledged_ram, messages_persistent, message_bytes, message_bytes_ready, message_bytes_unacknowledged, message_bytes_ram, - message_bytes_persistent, + message_bytes_persistent, head_msg_timestamp, disk_reads, disk_writes, backing_queue_status]). -ifdef(use_specs). diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 88c28ac8a9..19941f508f 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -877,6 +877,11 @@ info(message_bytes_ram, #vqstate{ram_bytes = RamBytes}) -> RamBytes; info(message_bytes_persistent, #vqstate{persistent_bytes = PersistentBytes}) -> PersistentBytes; +info(head_msg_timestamp, #vqstate{ + q1 = Q1, q2 = Q2, delta = Delta, q3 = Q3, q4 = Q4, + ram_pending_ack = RPA, + disk_pending_ack = DPA }) -> + head_msg_timestamp(Q3, Q4, RPA, DPA); info(disk_reads, #vqstate{disk_read_count = Count}) -> Count; info(disk_writes, #vqstate{disk_write_count = Count}) -> @@ -901,7 +906,6 @@ info(backing_queue_status, #vqstate { {len , Len}, {target_ram_count , TargetRamCount}, {next_seq_id , NextSeqId}, - {head_msg_timestamp , head_msg_timestamp(Q3, Q4, RPA, DPA)}, {avg_ingress_rate , AvgIngressRate}, {avg_egress_rate , AvgEgressRate}, {avg_ack_ingress_rate, AvgAckIngressRate}, |