You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2009/12/18 17:09:31 UTC
svn commit: r892291 -
/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
Author: gtully
Date: Fri Dec 18 16:09:29 2009
New Revision: 892291
URL: http://svn.apache.org/viewvc?rev=892291&view=rev
Log:
add commit replay test to assert dups suppressed for KahaDB
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java?rev=892291&r1=892290&r2=892291&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java Fri Dec 18 16:09:29 2009
@@ -20,6 +20,8 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.io.File;
+import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
@@ -39,6 +41,7 @@
import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.command.TransactionId;
import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
+import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.After;
@@ -106,20 +109,24 @@
@Test
public void testFailoverCommitReplyLost() throws Exception {
- doTestFailoverCommitReplyLost(false);
+ doTestFailoverCommitReplyLost(0);
}
@Test
public void testFailoverCommitReplyLostJdbc() throws Exception {
- doTestFailoverCommitReplyLost(true);
+ doTestFailoverCommitReplyLost(1);
}
- public void doTestFailoverCommitReplyLost(boolean useJdbcPersistenceAdapter) throws Exception {
+ @Test
+ public void testFailoverCommitReplyLostKahaDB() throws Exception {
+ doTestFailoverCommitReplyLost(2);
+ }
+
+ public void doTestFailoverCommitReplyLost(final int adapter) throws Exception {
broker = createBroker(true);
- if (useJdbcPersistenceAdapter) {
- broker.setPersistenceAdapter(new JDBCPersistenceAdapter());
- }
+ setPersistenceAdapter(adapter);
+
broker.setPlugins(new BrokerPlugin[] {
new BrokerPluginSupport() {
@Override
@@ -173,9 +180,7 @@
// will be stopped by the plugin
broker.waitUntilStopped();
broker = createBroker(false);
- if (useJdbcPersistenceAdapter) {
- broker.setPersistenceAdapter(new JDBCPersistenceAdapter());
- }
+ setPersistenceAdapter(adapter);
broker.start();
assertTrue("tx committed trough failover", commitDoneLatch.await(30, TimeUnit.SECONDS));
@@ -195,9 +200,7 @@
LOG.info("Checking for remaining/hung messages..");
broker = createBroker(false);
- if (useJdbcPersistenceAdapter) {
- broker.setPersistenceAdapter(new JDBCPersistenceAdapter());
- }
+ setPersistenceAdapter(adapter);
broker.start();
// after restart, ensure no dangling messages
@@ -215,6 +218,21 @@
connection.close();
}
+ private void setPersistenceAdapter(int adapter) throws IOException {
+ switch (adapter) {
+ case 0:
+ break;
+ case 1:
+ broker.setPersistenceAdapter(new JDBCPersistenceAdapter());
+ break;
+ case 2:
+ KahaDBPersistenceAdapter store = new KahaDBPersistenceAdapter();
+ store.setDirectory(new File("target/activemq-data/kahadb/FailoverTransactionTest"));
+ broker.setPersistenceAdapter(store);
+ break;
+ }
+ }
+
@Test
public void testFailoverProducerCloseBeforeTransactionFailWhenDisabled() throws Exception {
startCleanBroker();