Repository: activemq Updated Branches: refs/heads/activemq-5.13.x 871f0a600 -> a73ada062
https://issues.apache.org/jira/browse/AMQ-6097 Fixing JournalCorruptionEofIndexRecoveryTest class Because of the size being stored in the message order index, the test testRecoveryAftercorruptionCheckSumExistingIndex was no longer passing as that test was corrupting the size value in the journal, but not the size value in the index. The test now corrupts both values so that the expect exception occurs again. (cherry picked from commit 507d40a79f15449ba6d79ef85d7fdf6bf50a3a65) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/a73ada06 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/a73ada06 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/a73ada06 Branch: refs/heads/activemq-5.13.x Commit: a73ada062960e72b5f22bb8cbb914997f72f4a37 Parents: b103932 Author: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Authored: Mon Dec 21 16:45:02 2015 +0000 Committer: Christopher L. Shannon (cshannon) <christopher.l.shan...@gmail.com> Committed: Tue Dec 22 13:14:44 2015 +0000 ---------------------------------------------------------------------- .../JournalCorruptionEofIndexRecoveryTest.java | 38 +++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/a73ada06/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionEofIndexRecoveryTest.java ---------------------------------------------------------------------- diff --git a/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionEofIndexRecoveryTest.java b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionEofIndexRecoveryTest.java index 07e5e2e..cf60a08 100644 --- a/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionEofIndexRecoveryTest.java +++ b/activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionEofIndexRecoveryTest.java @@ -20,11 +20,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; +import java.util.Iterator; +import java.util.Map.Entry; import javax.jms.Connection; import javax.jms.Destination; @@ -36,8 +37,11 @@ import javax.jms.Session; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.command.ActiveMQQueue; +import org.apache.activemq.store.kahadb.MessageDatabase.MessageKeys; +import org.apache.activemq.store.kahadb.MessageDatabase.StoredDestination; import org.apache.activemq.store.kahadb.disk.journal.DataFile; import org.apache.activemq.store.kahadb.disk.journal.Journal; +import org.apache.activemq.store.kahadb.disk.page.Transaction; import org.apache.activemq.util.ByteSequence; import org.apache.activemq.util.IOHelper; import org.apache.activemq.util.RecoverableRandomAccessFile; @@ -252,6 +256,7 @@ public class JournalCorruptionEofIndexRecoveryTest { size -= 1; LOG.info("rewrite incorrect location size @:" + (pos + Journal.BATCH_CONTROL_RECORD_SIZE) + " as: " + size); randomAccessFile.writeInt(size); + corruptOrderIndex(id, size); randomAccessFile.getChannel().force(true); } @@ -271,6 +276,37 @@ public class JournalCorruptionEofIndexRecoveryTest { randomAccessFile.getChannel().force(true); } + private void corruptOrderIndex(final int num, final int size) throws Exception { + //This is because of AMQ-6097, now that the MessageOrderIndex stores the size in the Location, + //we need to corrupt that value as well + final KahaDBStore kahaDbStore = (KahaDBStore) ((KahaDBPersistenceAdapter) broker.getPersistenceAdapter()).getStore(); + kahaDbStore.indexLock.writeLock().lock(); + try { + kahaDbStore.pageFile.tx().execute(new Transaction.Closure<IOException>() { + @Override + public void execute(Transaction tx) throws IOException { + StoredDestination sd = kahaDbStore.getStoredDestination(kahaDbStore.convert( + (ActiveMQQueue)destination), tx); + int i = 1; + for (Iterator<Entry<Long, MessageKeys>> iterator = sd.orderIndex.iterator(tx); iterator.hasNext();) { + Entry<Long, MessageKeys> entry = iterator.next(); + if (i == num) { + //change the size value to the wrong size + sd.orderIndex.get(tx, entry.getKey()); + MessageKeys messageKeys = entry.getValue(); + messageKeys.location.setSize(size); + sd.orderIndex.put(tx, sd.orderIndex.lastGetPriority(), entry.getKey(), messageKeys); + break; + } + i++; + } + } + }); + } finally { + kahaDbStore.indexLock.writeLock().unlock(); + } + } + private ArrayList<Integer> findBatch(RecoverableRandomAccessFile randomAccessFile, int where) throws IOException { final ArrayList<Integer> batchPositions = new ArrayList<Integer>(); final ByteSequence header = new ByteSequence(Journal.BATCH_CONTROL_RECORD_HEADER);
