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/10/13 15:56:36 UTC
qpid-broker-j git commit: QPID-7913: [Java Broker] Log warning only
for persistent unused messages
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 8770d41dd -> a0eccb5cf
QPID-7913: [Java Broker] Log warning only for persistent unused messages
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/a0eccb5c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/a0eccb5c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/a0eccb5c
Branch: refs/heads/master
Commit: a0eccb5cf3f508fc7add59ff8785077c6c1da2a5
Parents: 8770d41
Author: Alex Rudyy <or...@apache.org>
Authored: Fri Oct 13 16:54:16 2017 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Fri Oct 13 16:54:16 2017 +0100
----------------------------------------------------------------------
.../virtualhost/AsynchronousMessageStoreRecoverer.java | 8 +++++---
.../server/virtualhost/SynchronousMessageStoreRecoverer.java | 5 ++++-
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a0eccb5c/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
index 0e362bc..cfdeba7 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AsynchronousMessageStoreRecoverer.java
@@ -213,9 +213,11 @@ public class AsynchronousMessageStoreRecoverer implements MessageStoreRecoverer
{
if (_continueRecovery.get())
{
- _logger.info("Message id "
- + storedMessage.getMessageNumber()
- + " in store, but not in any queue - removing....");
+ if (storedMessage.getMetaData().isPersistent())
+ {
+ _logger.warn("Message id {} in store, but not in any queue - removing....",
+ storedMessage.getMessageNumber());
+ }
storedMessage.remove();
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/a0eccb5c/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
index 152a2b3..3ed203f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/virtualhost/SynchronousMessageStoreRecoverer.java
@@ -102,7 +102,10 @@ public class SynchronousMessageStoreRecoverer implements MessageStoreRecoverer
for(StoredMessage<?> m : unusedMessages.values())
{
- _logger.warn("Message id " + m.getMessageNumber() + " in store, but not in any queue - removing....");
+ if (m.getMetaData().isPersistent())
+ {
+ _logger.warn("Message id {} in store, but not in any queue - removing....", m.getMessageNumber());
+ }
m.remove();
}
eventLogger.message(logSubject, TransactionLogMessages.RECOVERY_COMPLETE(null, false));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org