Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 507d40a79f)
This commit is contained in:
Christopher L. Shannon (cshannon) 2015-12-21 16:45:02 +00:00
parent b103932ccd
commit a73ada0629
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
activemq-kahadb-store/src/test/java/org/apache/activemq/store/kahadb/JournalCorruptionEofIndexRecoveryTest.java
View File

@ -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);