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/04/26 13:53:51 UTC
[2/3] activemq-artemis git commit: [ARTEMIS-1823] - Log warning on
boot when persistence is disabled and paging enabled
[ARTEMIS-1823] - Log warning on boot when persistence is disabled and paging enabled
no tests are needed as this is a simple logging change.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/04d83905
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/04d83905
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/04d83905
Branch: refs/heads/master
Commit: 04d8390513b8e33c744cb2e98675229b4956b92e
Parents: 5daa376
Author: JiriOndrusek <jo...@redhat.com>
Authored: Mon Apr 23 14:57:09 2018 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Apr 26 09:48:06 2018 -0400
----------------------------------------------------------------------
.../artemis/core/server/ActiveMQServerLogger.java | 4 ++++
.../artemis/core/server/impl/ActiveMQServerImpl.java | 11 +++++++++++
2 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/04d83905/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 c3f0a7d..6cd69ae 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
@@ -1934,4 +1934,8 @@ public interface ActiveMQServerLogger extends BasicLogger {
@LogMessage(level = Logger.Level.WARN)
@Message(id = 224091, value = "Bridge {0} is unable to connect to destination. Retrying", format = Message.Format.MESSAGE_FORMAT)
void errorConnectingBridgeRetry(Bridge bridge);
+
+ @LogMessage(level = Logger.Level.INFO)
+ @Message(id = 224092, value = "Despite disabled persistence, page files will be persisted.", format = Message.Format.MESSAGE_FORMAT)
+ void pageWillBePersisted();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/04d83905/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 050a776..b5496a9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -154,6 +154,7 @@ import org.apache.activemq.artemis.core.server.reload.ReloadManager;
import org.apache.activemq.artemis.core.server.reload.ReloadManagerImpl;
import org.apache.activemq.artemis.core.server.transformer.Transformer;
import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
+import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.core.settings.impl.DeletionPolicy;
import org.apache.activemq.artemis.core.settings.impl.HierarchicalObjectRepository;
@@ -2323,6 +2324,16 @@ public class ActiveMQServerImpl implements ActiveMQServer {
deployAddressSettingsFromConfiguration();
}
+ //fix of ARTEMIS-1823
+ if (!configuration.isPersistenceEnabled()) {
+ for (AddressSettings addressSettings : addressSettingsRepository.values()) {
+ if (addressSettings.getAddressFullMessagePolicy() == AddressFullMessagePolicy.PAGE) {
+ ActiveMQServerLogger.LOGGER.pageWillBePersisted();
+ break;
+ }
+ }
+ }
+
storageManager.start();
postOffice.start();