You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/11/09 20:01:27 UTC
[3/4] activemq-artemis git commit: ARTEMIS-846 Disk full should be
informed during blocking as well
ARTEMIS-846 Disk full should be informed during blocking as well
https://issues.apache.org/jira/browse/ARTEMIS-846
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/5acb6953
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/5acb6953
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/5acb6953
Branch: refs/heads/master
Commit: 5acb6953a6f8d729704738ed8f686c1ed8f6a69f
Parents: 3b45435
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Nov 9 14:47:02 2016 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Nov 9 14:47:06 2016 -0500
----------------------------------------------------------------------
.../activemq/artemis/core/paging/impl/PagingStoreImpl.java | 6 +++++-
.../activemq/artemis/core/server/ActiveMQServerLogger.java | 5 +++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5acb6953/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
index f05ace0..88cfe46 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
@@ -681,7 +681,11 @@ public class PagingStoreImpl implements PagingStore {
}
if (!blocking.get()) {
- ActiveMQServerLogger.LOGGER.blockingMessageProduction(address, sizeInBytes.get(), maxSize);
+ if (pagingManager.isDiskFull()) {
+ ActiveMQServerLogger.LOGGER.blockingDiskFull(address);
+ } else {
+ ActiveMQServerLogger.LOGGER.blockingMessageProduction(address, sizeInBytes.get(), maxSize);
+ }
blocking.set(true);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5acb6953/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
index 51aa57b..2b58685 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
@@ -1261,6 +1261,11 @@ public interface ActiveMQServerLogger extends BasicLogger {
format = Message.Format.MESSAGE_FORMAT)
void diskCapacityRestored();
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 222212, value = "Disk Full! Blocking message production on address ''{0}''. Clients will report blocked.", format = Message.Format.MESSAGE_FORMAT)
+ void blockingDiskFull(SimpleString addressName);
+
+
@LogMessage(level = Logger.Level.ERROR)
@Message(id = 224000, value = "Failure in initialisation", format = Message.Format.MESSAGE_FORMAT)
void initializationError(@Cause Throwable e);