activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gtu...@apache.org
Subject activemq git commit: [AMQ-6670] - trap classcast and marshall errors on load message from journal such that errors are consistently propagated to the ioExceptionHandler
Date Fri, 05 May 2017 14:45:30 GMT
Repository: activemq
Updated Branches:
  refs/heads/master ae97fbd52 -> 2518bded6


[AMQ-6670] - trap classcast and marshall errors on load message from journal such that errors
are consistently propagated to the ioExceptionHandler


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

Branch: refs/heads/master
Commit: 2518bded67b765463bab7742708bcaf4f706b46d
Parents: ae97fbd
Author: gtully <gary.tully@gmail.com>
Authored: Fri May 5 15:43:09 2017 +0100
Committer: gtully <gary.tully@gmail.com>
Committed: Fri May 5 15:43:09 2017 +0100

----------------------------------------------------------------------
 .../activemq/store/kahadb/KahaDBStore.java      |  12 +-
 .../activemq/store/kahadb/MessageDatabase.java  |   2 +-
 .../kahadb/JournalCorruptionExceptionTest.java  | 201 +++++++++++++++++++
 3 files changed, 212 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/2518bded/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
index 758d0de..2bf80a0 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/KahaDBStore.java
@@ -82,6 +82,7 @@ import org.apache.activemq.store.kahadb.disk.page.Transaction;
 import org.apache.activemq.store.kahadb.scheduler.JobSchedulerStoreImpl;
 import org.apache.activemq.usage.MemoryUsage;
 import org.apache.activemq.usage.SystemUsage;
+import org.apache.activemq.util.IOExceptionSupport;
 import org.apache.activemq.util.ServiceStopper;
 import org.apache.activemq.util.ThreadPoolUtils;
 import org.apache.activemq.wireformat.WireFormat;
@@ -1244,12 +1245,19 @@ public class KahaDBStore extends MessageDatabase implements PersistenceAdapter,
                 case KAHA_UPDATE_MESSAGE_COMMAND:
                     addMessage = ((KahaUpdateMessageCommand) command).getMessage();
                     break;
-                default:
+                case KAHA_ADD_MESSAGE_COMMAND:
                     addMessage = (KahaAddMessageCommand) command;
+                    break;
+                default:
+                    throw new IOException("Could not load journal record, unexpected command
type: " + command.type() + " at location: " + location);
+            }
+            if (!addMessage.hasMessage()) {
+                throw new IOException("Could not load journal record, null message content
at location: " + location);
             }
             Message msg = (Message) wireFormat.unmarshal(new DataInputStream(addMessage.getMessage().newInput()));
             return msg;
-        } catch (IOException ioe) {
+        } catch (Throwable t) {
+            IOException ioe = IOExceptionSupport.create("Unexpected error on journal read
at: " + location , t);
             LOG.error("Failed to load message at: {}", location , ioe);
             brokerService.handleIOException(ioe);
             throw ioe;

http://git-wip-us.apache.org/repos/asf/activemq/blob/2518bded/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index af03c5e..3321b35 100644
--- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -1170,7 +1170,7 @@ public abstract class MessageDatabase extends ServiceSupport implements
BrokerSe
             try {
                 is.close();
             } catch (IOException e) {}
-            throw new IOException("Could not load journal record. Invalid location: "+location);
+            throw new IOException("Could not load journal record, null type information from:
" + readByte + " at location: "+location);
         }
         JournalCommand<?> message = (JournalCommand<?>)type.createMessage();
         message.mergeFramed(is);

http://git-wip-us.apache.org/repos/asf/activemq/blob/2518bded/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionExceptionTest.java
----------------------------------------------------------------------
diff --git a/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionExceptionTest.java
b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionExceptionTest.java
new file mode 100644
index 0000000..217bf45
--- /dev/null
+++ b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionExceptionTest.java
@@ -0,0 +1,201 @@
+/**
+ * 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
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.store.kahadb;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.region.policy.PolicyEntry;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.store.kahadb.disk.journal.DataFile;
+import org.apache.activemq.util.RecoverableRandomAccessFile;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jms.Connection;
+import javax.jms.Destination;
+import javax.jms.Message;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+
+import static org.apache.activemq.store.kahadb.JournalCorruptionEofIndexRecoveryTest.drain;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+@RunWith(Parameterized.class)
+public class JournalCorruptionExceptionTest {
+
+    private static final Logger LOG = LoggerFactory.getLogger(JournalCorruptionExceptionTest.class);
+
+    private final String KAHADB_DIRECTORY = "target/activemq-data/";
+    private final String payload = new String(new byte[1024]);
+
+    private ActiveMQConnectionFactory cf = null;
+    private BrokerService broker = null;
+    private final Destination destination = new ActiveMQQueue("Test");
+    private String connectionUri;
+    private KahaDBPersistenceAdapter adapter;
+
+    @Parameterized.Parameter(0)
+    public byte fill = Byte.valueOf("3");
+
+    @Parameterized.Parameter(1)
+    public int fillLength = 10;
+
+    @Parameterized.Parameters(name = "fill=#{0},#{1}")
+    public static Iterable<Object[]> parameters() {
+        // corruption can be valid record type values
+        return Arrays.asList(new Object[][]{
+                {Byte.valueOf("0"), 10},
+                {Byte.valueOf("1"), 10},
+                {Byte.valueOf("1"), 9},
+                {Byte.valueOf("2"), 20},
+                {Byte.valueOf("-1"), 10}
+        });
+    }
+
+    protected void startBroker() throws Exception {
+        doStartBroker(true);
+    }
+
+    private void doStartBroker(boolean delete) throws Exception {
+        broker = new BrokerService();
+        broker.setDeleteAllMessagesOnStartup(delete);
+        broker.setPersistent(true);
+        broker.setUseJmx(true);
+        broker.setDataDirectory(KAHADB_DIRECTORY);
+        broker.addConnector("tcp://localhost:0");
+
+        PolicyMap policyMap = new PolicyMap();
+        PolicyEntry defaultEntry = new PolicyEntry();
+        defaultEntry.setUseCache(false);
+        policyMap.setDefaultEntry(defaultEntry);
+        broker.setDestinationPolicy(policyMap);
+
+        configurePersistence(broker);
+
+        connectionUri = "vm://localhost?create=false";
+        cf = new ActiveMQConnectionFactory(connectionUri);
+
+        broker.start();
+        LOG.info("Starting broker..");
+    }
+
+    protected void configurePersistence(BrokerService brokerService) throws Exception {
+        adapter = (KahaDBPersistenceAdapter) brokerService.getPersistenceAdapter();
+
+        // ensure there are a bunch of data files but multiple entries in each
+        adapter.setJournalMaxFileLength(1024 * 20);
+
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        if (broker != null) {
+            broker.stop();
+            broker.waitUntilStopped();
+        }
+    }
+
+    @Test
+    public void testIOExceptionOnCorruptJournalLocationRead() throws Exception {
+        startBroker();
+
+        produceMessagesToConsumeMultipleDataFiles(50);
+
+        int numFiles = getNumberOfJournalFiles();
+
+        assertTrue("more than x files: " + numFiles, numFiles > 4);
+
+        corruptLocationAtDataFileIndex(3);
+
+        assertEquals("missing one message", 50, broker.getAdminView().getTotalMessageCount());
+        assertEquals("Drain", 0, drainQueue(50));
+        assertTrue("broker stopping", broker.isStopping());
+    }
+
+
+    private void corruptLocationAtDataFileIndex(int id) throws IOException {
+
+        Collection<DataFile> files = ((KahaDBPersistenceAdapter) broker.getPersistenceAdapter()).getStore().getJournal().getFileMap().values();
+        DataFile dataFile = (DataFile) files.toArray()[id];
+
+        RecoverableRandomAccessFile randomAccessFile = dataFile.openRandomAccessFile();
+        int offset = 2415;
+
+        if (fillLength < 10) {
+            offset += (fillLength * 2);
+        }
+
+        LOG.info("Whacking batch record in file:" + id + ", at offset: " + offset + " with
fill:" + fill);
+        // whack that record
+        byte[] bla = new byte[fillLength];
+        Arrays.fill(bla, fill);
+        randomAccessFile.seek(offset);
+        randomAccessFile.write(bla, 0, bla.length);
+        randomAccessFile.getFD().sync();
+    }
+
+    private int getNumberOfJournalFiles() throws IOException {
+        Collection<DataFile> files = ((KahaDBPersistenceAdapter) broker.getPersistenceAdapter()).getStore().getJournal().getFileMap().values();
+        int reality = 0;
+        for (DataFile file : files) {
+            if (file != null) {
+                reality++;
+            }
+        }
+        return reality;
+    }
+
+    private int produceMessages(Destination destination, int numToSend) throws Exception
{
+        int sent = 0;
+        Connection connection = new ActiveMQConnectionFactory(broker.getTransportConnectors().get(0).getConnectUri()).createConnection();
+        connection.start();
+        try {
+            Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+            MessageProducer producer = session.createProducer(destination);
+            for (int i = 0; i < numToSend; i++) {
+                producer.send(createMessage(session, i));
+                sent++;
+            }
+        } finally {
+            connection.close();
+        }
+
+        return sent;
+    }
+
+    private int produceMessagesToConsumeMultipleDataFiles(int numToSend) throws Exception
{
+        return produceMessages(destination, numToSend);
+    }
+
+    private Message createMessage(Session session, int i) throws Exception {
+        return session.createTextMessage(payload + "::" + i);
+    }
+
+    private int drainQueue(int max) throws Exception {
+        return drain(cf, destination, max);
+    }
+
+}


Mime
View raw message