You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2018/07/31 18:26:30 UTC
[1/2] activemq-artemis git commit: [ARTEMIS-1994]Include
global-size-bytes in WARN message AMQ222038/39 for paging
Repository: activemq-artemis
Updated Branches:
refs/heads/master bdbbcc723 -> 168a7cfea
[ARTEMIS-1994]Include global-size-bytes in WARN message AMQ222038/39 for paging
[ARTEMIS-1994]Minor changes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/29f39631
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/29f39631
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/29f39631
Branch: refs/heads/master
Commit: 29f39631dc226a64e89344602f27ae09ab3cdb66
Parents: bdbbcc7
Author: Shailendra Kumar Singh <sh...@gmail.com>
Authored: Mon Jul 30 09:24:13 2018 +0530
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 31 14:25:45 2018 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/paging/impl/PagingStoreImpl.java | 4 ++--
.../activemq/artemis/core/server/ActiveMQServerLogger.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/29f39631/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 6a07ffc..39687b0 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
@@ -739,7 +739,7 @@ public class PagingStoreImpl implements PagingStore {
if (size > 0) {
if (maxSize != -1 && newSize > maxSize || globalFull) {
if (startPaging()) {
- ActiveMQServerLogger.LOGGER.pageStoreStart(storeName, newSize, maxSize);
+ ActiveMQServerLogger.LOGGER.pageStoreStart(storeName, newSize, maxSize, pagingManager.getGlobalSize());
}
}
}
@@ -785,7 +785,7 @@ public class PagingStoreImpl implements PagingStore {
if (!printedDropMessagesWarning) {
printedDropMessagesWarning = true;
- ActiveMQServerLogger.LOGGER.pageStoreDropMessages(storeName, sizeInBytes.get(), maxSize);
+ ActiveMQServerLogger.LOGGER.pageStoreDropMessages(storeName, sizeInBytes.get(), maxSize, pagingManager.getGlobalSize());
}
if (message.isLargeMessage()) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/29f39631/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 50e89a2..b10d652 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
@@ -580,12 +580,12 @@ public interface ActiveMQServerLogger extends BasicLogger {
void pageStoreStartIOError(@Cause Exception e);
@LogMessage(level = Logger.Level.WARN)
- @Message(id = 222038, value = "Starting paging on address ''{0}''; size is currently: {1} bytes; max-size-bytes: {2}", format = Message.Format.MESSAGE_FORMAT)
- void pageStoreStart(SimpleString storeName, long addressSize, long maxSize);
+ @Message(id = 222038, value = "Starting paging on address ''{0}''; size is currently: {1} bytes; max-size-bytes: {2}; global-size-bytes: {3}", format = Message.Format.MESSAGE_FORMAT)
+ void pageStoreStart(SimpleString storeName, long addressSize, long maxSize, long globalMaxSize);
@LogMessage(level = Logger.Level.WARN)
- @Message(id = 222039, value = "Messages sent to address ''{0}'' are being dropped; size is currently: {1} bytes; max-size-bytes: {2}", format = Message.Format.MESSAGE_FORMAT)
- void pageStoreDropMessages(SimpleString storeName, long addressSize, long maxSize);
+ @Message(id = 222039, value = "Messages sent to address ''{0}'' are being dropped; size is currently: {1} bytes; max-size-bytes: {2}; global-size-bytes: {3}", format = Message.Format.MESSAGE_FORMAT)
+ void pageStoreDropMessages(SimpleString storeName, long addressSize, long maxSize, long globalMaxSize);
@LogMessage(level = Logger.Level.WARN)
@Message(id = 222040, value = "Server is stopped", format = Message.Format.MESSAGE_FORMAT)
[2/2] activemq-artemis git commit: This closes #2196
Posted by cl...@apache.org.
This closes #2196
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/168a7cfe
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/168a7cfe
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/168a7cfe
Branch: refs/heads/master
Commit: 168a7cfea56b0dc126986596efd0d9b3c7114b1a
Parents: bdbbcc7 29f3963
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Jul 31 14:25:46 2018 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Jul 31 14:25:46 2018 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/paging/impl/PagingStoreImpl.java | 4 ++--
.../activemq/artemis/core/server/ActiveMQServerLogger.java | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------