Author: ritchiem
Date: 2009-04-03 06:14:17 -0400 (Fri, 03 Apr 2009)
New Revision: 3255
Modified:
store/trunk/java/bdbstore/build.xml
store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessagePersistenceTest.java
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/utils/BDBVMTestCase.java
store/trunk/java/bdbstore/test-provider.properties
Log:
Update based on QPID-1764 to correct tests and ensure testing can be carried out
correctly
Modified: store/trunk/java/bdbstore/build.xml
===================================================================
--- store/trunk/java/bdbstore/build.xml 2009-04-02 19:52:24 UTC (rev 3254)
+++ store/trunk/java/bdbstore/build.xml 2009-04-03 10:14:17 UTC (rev 3255)
@@ -39,6 +39,8 @@
<property file="${project.root}/default.testprofile"/>
+ <echo message="${project.root} ${file}"/>
+
<path id="class.path">
<fileset dir="lib">
<include name="**/*.jar"/>
Modified:
store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java
===================================================================
---
store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-04-02
19:52:24 UTC (rev 3254)
+++
store/trunk/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java 2009-04-03
10:14:17 UTC (rev 3255)
@@ -1145,6 +1145,7 @@
if (_log.isDebugEnabled())
{
_log.debug("commit tran Async(" + context.isAsync() + ")
completed");
+ new Exception("Async
Transaction:"+tx).printStackTrace(System.out);
}
}
catch (DatabaseException e)
@@ -1279,10 +1280,11 @@
}
catch (Throwable ioobe)
{
- abortTran(context);
+ abortTran(context);
- throw new AMQException("Invalid database format. Please use upgrade tool
for store in Virtualhost:'"
- + _virtualHost.getName() + "'",
ioobe.getCause() != null ? ioobe.getCause() : ioobe);
+ Throwable cause = ioobe.getCause() != null ? ioobe.getCause() : ioobe;
+ throw new AMQException("A database error occured during
recovery:'" + cause.getMessage() + "'"
+ + _virtualHost.getName() + "'", cause);
}
stateTransition(State.RECOVERING, State.STARTED);
Modified:
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
===================================================================
---
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java 2009-04-02
19:52:24 UTC (rev 3254)
+++
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java 2009-04-03
10:14:17 UTC (rev 3255)
@@ -111,6 +111,7 @@
}
catch (Exception e)
{
+ System.err.println("Showing stack trace. expecting Unable to load
BDBStore error");
e.printStackTrace();
assertTrue("Incorrect Exception Thrown:" + e.getMessage(),
e.getMessage().contains("Unable to load BDBStore as version
1. Store on disk contains version 2 data"));
Modified:
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessagePersistenceTest.java
===================================================================
---
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessagePersistenceTest.java 2009-04-02
19:52:24 UTC (rev 3254)
+++
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/MessagePersistenceTest.java 2009-04-03
10:14:17 UTC (rev 3255)
@@ -240,7 +240,7 @@
// Check that it is enqueued
List<AMQQueue> queueList =
_transactionLog.getMessageReferenceMap(messageId);
- assertNotNull(queueList);
+ assertNotNull("Reference map should contain two queues.", queueList);
assertEquals("Message should be enqueued on both queues.", 2,
queueList.size());
assertTrue("Queue1 not contained in list.",
queueList.contains(_queue1));
assertTrue("Queue2 not contained in list.",
queueList.contains(_queue2));
Modified:
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/utils/BDBVMTestCase.java
===================================================================
---
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/utils/BDBVMTestCase.java 2009-04-02
19:52:24 UTC (rev 3254)
+++
store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/utils/BDBVMTestCase.java 2009-04-03
10:14:17 UTC (rev 3255)
@@ -75,10 +75,24 @@
}
//Reset BDB_WORK
- System.setProperty(BDB_WORK, BDB_WORK_PRE_TEST == null ? "" :
BDB_WORK_PRE_TEST);
+ if (BDB_WORK_PRE_TEST == null)
+ {
+ System.clearProperty(BDB_WORK);
+ }
+ else
+ {
+ System.setProperty(BDB_WORK, BDB_WORK_PRE_TEST);
+ }
//Reset QPID_WORK
- System.setProperty(QPID_WORK, QPID_WORK_PRE_TEST == null ? "" :
QPID_WORK_PRE_TEST);
+ if (QPID_WORK_PRE_TEST == null)
+ {
+ System.clearProperty(QPID_WORK);
+ }
+ else
+ {
+ System.setProperty(QPID_WORK, QPID_WORK_PRE_TEST);
+ }
}
public void setupWorkDirectory()
Modified: store/trunk/java/bdbstore/test-provider.properties
===================================================================
--- store/trunk/java/bdbstore/test-provider.properties 2009-04-02 19:52:24 UTC (rev 3254)
+++ store/trunk/java/bdbstore/test-provider.properties 2009-04-03 10:14:17 UTC (rev 3255)
@@ -19,16 +19,21 @@
#
#
-connectionfactory.vm =
amqp://username:password@clientid/test?brokerlist='vm://:1'
+connectionfactory.default =
amqp://username:password@clientid/test?brokerlist='tcp://localhost:5672'
+connectionfactory.default.vm =
amqp://username:password@clientid/test?brokerlist='vm://:1'
+connectionfactory.ssl =
amqp://username:password@clientid/test?brokerlist='tcp://localhost:5671?ssl='true''
-connectionfactory.vmfailover =
amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1'
-connectionfactory.connection1 =
amqp://username:password@clientid/test?brokerlist='vm://:1'
-connectionfactory.connection2 =
amqp://username:password@clientid/test?brokerlist='vm://:2'
+connectionfactory.failover =
amqp://username:password@clientid/test?brokerlist='tcp://localhost:5673;tcp://localhost:5672'&sync_ack='true'&sync_publish='all'&failover='roundrobin?cyclecount='20''
+connectionfactory.failover.vm =
amqp://username:password@clientid/test?brokerlist='vm://:2;vm://:1'
+connectionfactory.connection1 =
amqp://username:password@clientid/test?brokerlist='tcp://localhost:5672'
+connectionfactory.connection2 =
amqp://username:password@clientid/test?brokerlist='tcp://localhost:5673'
+connectionfactory.connection1.vm =
amqp://username:password@clientid/test?brokerlist='vm://:1'
+connectionfactory.connection2.vm =
amqp://username:password@clientid/test?brokerlist='vm://:2'
-#queue.MyQueue = example.MyQueue
+queue.MyQueue = example.MyQueue
queue.queue = example.queue
-#queue.xaQueue = xaQueue
+queue.xaQueue = xaQueue
-#topic.xaTopic = xaTopic
-#topic.durableSubscriberTopic = durableSubscriberTopic
+topic.xaTopic = xaTopic
+topic.durableSubscriberTopic = durableSubscriberTopic