activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [1/2] activemq-artemis git commit: ARTEMIS-1224 - change the journal file size to nearest multiple
Date Wed, 14 Jun 2017 09:19:44 GMT
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 50c4039a4 -> 203e75047


ARTEMIS-1224 - change the journal file size to nearest multiple

https://issues.apache.org/jira/browse/ARTEMIS-1224


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/30a6ac70
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/30a6ac70
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/30a6ac70

Branch: refs/heads/master
Commit: 30a6ac703efe3539d13152f9311bedd7fd68aa9d
Parents: 50c4039
Author: Andy Taylor <andy.tayls67@gmail.com>
Authored: Mon Jun 12 16:20:43 2017 +0100
Committer: Andy Taylor <andy.tayls67@gmail.com>
Committed: Wed Jun 14 10:16:23 2017 +0100

----------------------------------------------------------------------
 .../impl/journal/JournalStorageManager.java     | 13 +++-
 .../core/server/ActiveMQServerLogger.java       |  4 +-
 .../persistence/JournalFileSizeTest.java        | 63 ++++++++++++++++++++
 3 files changed, 78 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/30a6ac70/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
index c8dbd44..27fdc6f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
@@ -146,7 +146,18 @@ public class JournalStorageManager extends AbstractJournalStorageManager
{
 
       journalFF.setDatasync(config.isJournalDatasync());
 
-      Journal localMessage = new JournalImpl(ioExecutors, config.getJournalFileSize(), config.getJournalMinFiles(),
config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(),
journalFF, "activemq-data", "amq", journalFF.getMaxIO(), 0);
+
+      int fileSize = config.getJournalFileSize();
+      // we need to correct the file size if its not a multiple of the alignement
+      int modulus = fileSize % journalFF.getAlignment();
+      if (modulus != 0) {
+         int difference = modulus;
+         int low = config.getJournalFileSize() - difference;
+         int high = low + journalFF.getAlignment();
+         fileSize = difference < journalFF.getAlignment() / 2 ? low : high;
+         ActiveMQServerLogger.LOGGER.invalidJournalFileSize(config.getJournalFileSize(),
fileSize, journalFF.getAlignment());
+      }
+      Journal localMessage = new JournalImpl(ioExecutors, fileSize, config.getJournalMinFiles(),
config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(),
journalFF, "activemq-data", "amq", journalFF.getMaxIO(), 0);
 
       messageJournal = localMessage;
       originalMessageJournal = localMessage;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/30a6ac70/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 84569b1..e3f37ce 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
@@ -338,7 +338,9 @@ public interface ActiveMQServerLogger extends BasicLogger {
       format = Message.Format.MESSAGE_FORMAT)
    void usingDefaultPaging(long bytes);
 
-
+   @LogMessage(level = Logger.Level.INFO)
+   @Message(id = 221058, value = "resetting Journal File size from {0} to {1} to fit with
alignment of {2}", format = Message.Format.MESSAGE_FORMAT)
+   void invalidJournalFileSize(int journalFileSize, int fileSize, int alignment);
 
    @LogMessage(level = Logger.Level.WARN)
    @Message(id = 222000, value = "ActiveMQServer is being finalized and has not been stopped.
Please remember to stop the server before letting it go out of scope",

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/30a6ac70/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JournalFileSizeTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JournalFileSizeTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JournalFileSizeTest.java
new file mode 100644
index 0000000..6a72095
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JournalFileSizeTest.java
@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tests.integration.persistence;
+
+
+import org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
+import org.apache.activemq.artemis.utils.OrderedExecutorFactory;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class JournalFileSizeTest {
+
+   @Test
+   public void testIncorrectFileSizeLower() {
+      ConfigurationImpl config = new ConfigurationImpl();
+      int origFileSize = config.getJournalFileSize();
+      config.setJournalFileSize(origFileSize + (512 / 2 - 1));
+      JournalStorageManager manager = new JournalStorageManager(config,
+            new OrderedExecutorFactory(null),
+            new OrderedExecutorFactory(null));
+      int fileSize = manager.getMessageJournal().getFileSize();
+      Assert.assertEquals(origFileSize, fileSize);
+   }
+
+   @Test
+   public void testIncorrectFileSizeHigher() {
+      ConfigurationImpl config = new ConfigurationImpl();
+      int origFileSize = config.getJournalFileSize();
+      config.setJournalFileSize(origFileSize + (512 / 2 + 1));
+      JournalStorageManager manager = new JournalStorageManager(config,
+            new OrderedExecutorFactory(null),
+            new OrderedExecutorFactory(null));
+      int fileSize = manager.getMessageJournal().getFileSize();
+      Assert.assertEquals(origFileSize + 512, fileSize);
+   }
+
+   @Test
+   public void testIncorrectFileSizeHalf() {
+      ConfigurationImpl config = new ConfigurationImpl();
+      int origFileSize = config.getJournalFileSize();
+      config.setJournalFileSize(origFileSize + (512 / 2));
+      JournalStorageManager manager = new JournalStorageManager(config,
+            new OrderedExecutorFactory(null),
+            new OrderedExecutorFactory(null));
+      int fileSize = manager.getMessageJournal().getFileSize();
+      Assert.assertEquals(origFileSize + 512, fileSize);
+   }
+}


Mime
View raw message