From 72354ee38fab9073ab4750ccd2281ba75bd2ffba Mon Sep 17 00:00:00 2001 From: Tomas Hofman Date: Wed, 10 Jun 2015 20:27:55 -0400 Subject: [PATCH] ARTEMIS-135 - Fix on journal load https://issues.apache.org/jira/browse/ARTEMIS-135 This is importing a recent fix from the journal on the old version. If a crash happened between the create file and the fill of the file the file wouldn't be loaded and the server wouldn't start until you removed the offending file --- .../core/journal/impl/JournalImpl.java | 21 ++++++++++++------- .../journal/ActiveMQJournalLogger.java | 4 ++++ .../journal/impl/JournalImplTestUnit.java | 21 +++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java index 8f74327f123..f394202e4d1 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java @@ -375,18 +375,25 @@ public List orderFiles() throws Exception { SequentialFile file = fileFactory.createSequentialFile(fileName, filesRepository.getMaxAIO()); - file.open(1, false); - - try + if (file.size() >= SIZE_HEADER) { + file.open(1, false); - JournalFileImpl jrnFile = readFileHeader(file); + try + { + JournalFileImpl jrnFile = readFileHeader(file); - orderedFiles.add(jrnFile); + orderedFiles.add(jrnFile); + } + finally + { + file.close(); + } } - finally + else { - file.close(); + ActiveMQJournalLogger.LOGGER.ignoringShortFile(fileName); + file.delete(); } } diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java index 73f8e85b2c0..4d2429da660 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java @@ -269,4 +269,8 @@ public interface ActiveMQJournalLogger extends BasicLogger @Message(id = 144006, value = "IOError code {0}, {1}", format = Message.Format.MESSAGE_FORMAT) void ioError(final int errorCode, final String errorMessage); + @LogMessage(level = Logger.Level.WARN) + @Message(id = 144007, value = "Ignoring journal file {0}: file is shorter then minimum header size. This file is being removed.", format = Message.Format.MESSAGE_FORMAT) + void ignoringShortFile(String fileName); + } diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java index 6ed956d73e8..ab86abc3fe2 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java @@ -18,6 +18,7 @@ import java.nio.ByteBuffer; import java.util.List; +import java.io.File; import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQIOErrorException; @@ -3222,6 +3223,26 @@ public void testAddTexThenUpdate() throws Exception } + @Test + public void testLoadTruncatedFile() throws Exception + { + setup(2, 2 * 1024, true); + createJournal(); + startJournal(); + + String testDir = getTestDir(); + new File(testDir + File.separator + filePrefix + "-1." + fileExtension).createNewFile(); + + try + { + load(); + } + catch (Exception e) + { + Assert.fail("Unexpected exception: " + e.toString()); + } + } + protected abstract int getAlignment(); }