You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/05/05 16:03:37 UTC
qpid-broker-j git commit: QPID-7763: Change operational log messages
for flow to disk to report more precise numbers
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 1424c408f -> 47b943e42
QPID-7763: Change operational log messages for flow to disk to report more precise numbers
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/47b943e4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/47b943e4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/47b943e4
Branch: refs/heads/master
Commit: 47b943e423d007116e009270438d20b87913e55e
Parents: 1424c40
Author: Alex Rudyy <or...@apache.org>
Authored: Fri May 5 17:03:08 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri May 5 17:03:08 2017 +0100
----------------------------------------------------------------------
.../qpid/server/logging/messages/QueueMessages.java | 4 ++--
.../logging/messages/Queue_logmessages.properties | 4 ++--
.../org/apache/qpid/server/queue/AbstractQueue.java | 16 ++++++++--------
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/47b943e4/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
index 1a00a4d..e73e173 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
@@ -384,7 +384,7 @@ public class QueueMessages
/**
* Log a Queue message of the Format:
- * <pre>QUE-1014 : Message flow to disk active : Queue direct memory : {0,number,#} kB / {1,number,#.##} kB, Broker direct memory : {2,number,#} kB / {3,number,#.##} kB</pre>
+ * <pre>QUE-1014 : Message flow to disk active : Queue : depth {0,number,#.##} kB, threshold {1,number,#.##} kB / Broker : direct memory used {2,number,#.##} MB, threshold {3,number,#.##} MB</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
@@ -558,7 +558,7 @@ public class QueueMessages
/**
* Log a Queue message of the Format:
- * <pre>QUE-1015 : Message flow to disk inactive : Queue direct memory : {0,number,#} kB / {1,number,#.##} kB, Broker direct memory : {2,number,#} kB / {3,number,#.##} kB</pre>
+ * <pre>QUE-1015 : Message flow to disk inactive : Queue : depth {0,number,#.##} kB, threshold {1,number,#.##} kB / Broker : direct memory used {2,number,#.##} MB, threshold {3,number,#.##} MB</pre>
* Optional values are contained in [square brackets] and are numbered
* sequentially in the method call.
*
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/47b943e4/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
index abf4bc0..9061f0d 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/messages/Queue_logmessages.properties
@@ -28,8 +28,8 @@ UNDERFULL = QUE-1004 : Underfull : Size : {0,number} bytes, Resume Capacity : {1
DROPPED = QUE-1005 : Dropped : {0,number} messages, Depth : {1,number} bytes, {2,number} messages, Capacity : {3,number} bytes, {4,number} messages
# use similar number to the broker for similar topic
-FLOW_TO_DISK_ACTIVE = QUE-1014 : Message flow to disk active : Queue : depth {0,number,#} kB, threshold {1,number,#.##} kB / Broker : direct memory used {2,number,#} MB, threshold {3,number,#.##} MB
-FLOW_TO_DISK_INACTIVE = QUE-1015 : Message flow to disk inactive : Queue : depth {0,number,#} kB, threshold {1,number,#.##} kB / Broker : direct memory used {2,number,#} MB, threshold {3,number,#.##} MB
+FLOW_TO_DISK_ACTIVE = QUE-1014 : Message flow to disk active : Queue : depth {0,number,#.##} kB, threshold {1,number,#.##} kB / Broker : direct memory used {2,number,#.##} MB, threshold {3,number,#.##} MB
+FLOW_TO_DISK_INACTIVE = QUE-1015 : Message flow to disk inactive : Queue : depth {0,number,#.##} kB, threshold {1,number,#.##} kB / Broker : direct memory used {2,number,#.##} MB, threshold {3,number,#.##} MB
# 0 - operation name
OPERATION = QUE-1016 : Operation : {0}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/47b943e4/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index a824438..6deda67 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -3372,10 +3372,10 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
{
if (!_lastReportedFlowToDiskStatus.getAndSet(true))
{
- getEventLogger().message(_logSubject, QueueMessages.FLOW_TO_DISK_ACTIVE(estimatedQueueSize / 1024,
- targetQueueSize / 1024,
- allocatedDirectMemorySize / 1024 / 1024,
- flowToDiskThreshold / 1024 / 1024));
+ getEventLogger().message(_logSubject, QueueMessages.FLOW_TO_DISK_ACTIVE(estimatedQueueSize / 1024.0,
+ targetQueueSize / 1024.0,
+ allocatedDirectMemorySize / 1024.0 / 1024.0,
+ flowToDiskThreshold / 1024.0 / 1024.0));
}
}
@@ -3386,10 +3386,10 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
{
if (_lastReportedFlowToDiskStatus.getAndSet(false))
{
- getEventLogger().message(_logSubject, QueueMessages.FLOW_TO_DISK_INACTIVE(estimatedQueueSize / 1024,
- targetQueueSize / 1024,
- allocatedDirectMemorySize / 1024 / 1024,
- flowToDiskThreshold / 1024 / 1024));
+ getEventLogger().message(_logSubject, QueueMessages.FLOW_TO_DISK_INACTIVE(estimatedQueueSize / 1024.0,
+ targetQueueSize / 1024.0,
+ allocatedDirectMemorySize / 1024.0 / 1024.0,
+ flowToDiskThreshold / 1024.0 / 1024.0));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org