rhmessaging-commits March 2011

rhmessaging-commits@lists.jboss.org

1 participants
5 discussions

rhmessaging commits: r4449 - store/branches/java/0.5.x-dev/src/test/java/org/apache/qpid/server/store/berkeleydb.

by rhmessaging-commits＠lists.jboss.org

Author: rgemmell Date: 2011-03-30 12:03:06 -0400 (Wed, 30 Mar 2011) New Revision: 4449 Modified: store/branches/java/0.5.x-dev/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java Log: updates to take into account changes to main broker codebase Modified: store/branches/java/0.5.x-dev/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java =================================================================== --- store/branches/java/0.5.x-dev/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java 2011-03-30 16:02:53 UTC (rev 4448) +++ store/branches/java/0.5.x-dev/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreTest.java 2011-03-30 16:03:06 UTC (rev 4449) @@ -288,7 +288,7 @@ Assert.assertEquals("ContentHeader ClassID has changed", chb.classId, returnedHeaderBody.classId); Assert.assertEquals("ContentHeader weight has changed", chb.weight, returnedHeaderBody.weight); Assert.assertEquals("ContentHeader bodySize has changed", chb.bodySize, returnedHeaderBody.bodySize); - BasicContentHeaderProperties returnedProperties = (BasicContentHeaderProperties) returnedHeaderBody.properties; + BasicContentHeaderProperties returnedProperties = (BasicContentHeaderProperties) returnedHeaderBody.getProperties(); Assert.assertEquals("Property ContentType has changed", props.getContentTypeAsString(), returnedProperties.getContentTypeAsString()); Assert.assertEquals("Property MessageID has changed", props.getMessageIdAsString(), returnedProperties.getMessageIdAsString()); Assert.assertEquals("MessageMD ChunkCount has changed", mmd.getContentChunkCount(), 1);

13 years, 8 months

1
0
0 / 0

rhmessaging commits: r4448 - store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb.

by rhmessaging-commits＠lists.jboss.org

Author: rgemmell Date: 2011-03-30 12:02:53 -0400 (Wed, 30 Mar 2011) New Revision: 4448 Modified: store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java Log: updates to take into account changes to main broker codebase Modified: store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java =================================================================== --- store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java 2011-03-21 17:50:21 UTC (rev 4447) +++ store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStoreTest.java 2011-03-30 16:02:53 UTC (rev 4448) @@ -141,7 +141,7 @@ assertEquals("ContentHeader weight has changed", chb_0_8.weight, returnedHeaderBody_0_8.weight); assertEquals("ContentHeader bodySize has changed", chb_0_8.bodySize, returnedHeaderBody_0_8.bodySize); - BasicContentHeaderProperties returnedProperties_0_8 = (BasicContentHeaderProperties) returnedHeaderBody_0_8.properties; + BasicContentHeaderProperties returnedProperties_0_8 = (BasicContentHeaderProperties) returnedHeaderBody_0_8.getProperties(); assertEquals("Property ContentType has changed", props_0_8.getContentTypeAsString(), returnedProperties_0_8.getContentTypeAsString()); assertEquals("Property MessageID has changed", props_0_8.getMessageIdAsString(), returnedProperties_0_8.getMessageIdAsString()); @@ -467,4 +467,4 @@ assertEquals("Second Message is incorrect", 32L, val.longValue()); } -} \ No newline at end of file +} 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 2011-03-21 17:50:21 UTC (rev 4447) +++ store/trunk/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java 2011-03-30 16:02:53 UTC (rev 4448) @@ -153,7 +153,7 @@ try { - ManagedQueue dursubQueue = jmxUtils.getManagedQueue("clientid" + "-" + SUB_NAME); + ManagedQueue dursubQueue = jmxUtils.getManagedQueue("clientid" + ":" + SUB_NAME); assertEquals("DurableSubscription backing queue should have 1 message on it initially", new Integer(1), dursubQueue.getMessageCount()); @@ -208,7 +208,7 @@ ManagedQueue queue = jmxUtils.getManagedQueue(QUEUE_NAME); assertFalse("Queue should not have been marked as Exclusive during upgrade", queue.isExclusive()); - ManagedQueue dursubQueue = jmxUtils.getManagedQueue("clientid" + "-" + SUB_NAME); + ManagedQueue dursubQueue = jmxUtils.getManagedQueue("clientid" + ":" + SUB_NAME); assertTrue("DurableSubscription backing queue should have been marked as Exclusive during upgrade", dursubQueue.isExclusive()); } finally

13 years, 8 months

1
0
0 / 0

rhmessaging commits: r4447 - in store/trunk/cpp: tests and 1 other directories.

by rhmessaging-commits＠lists.jboss.org

Author: kpvdr Date: 2011-03-21 13:50:21 -0400 (Mon, 21 Mar 2011) New Revision: 4447 Modified: store/trunk/cpp/lib/JournalImpl.h store/trunk/cpp/tests/python_tests/client_persistence.py store/trunk/cpp/tests/run_python_tests Log: Fix for python_tests.client_persistence.ExchangeQueueTests.test_topic_exchange, which was broken by recent changes to the Python API Modified: store/trunk/cpp/lib/JournalImpl.h =================================================================== --- store/trunk/cpp/lib/JournalImpl.h 2011-03-04 18:57:42 UTC (rev 4446) +++ store/trunk/cpp/lib/JournalImpl.h 2011-03-21 17:50:21 UTC (rev 4447) @@ -76,8 +76,8 @@ typedef boost::function<void (JournalImpl&)> DeleteCallback; private: - static qpid::sys::Mutex _static_lock; - static u_int32_t cnt; +// static qpid::sys::Mutex _static_lock; +// static u_int32_t cnt; qpid::sys::Timer& timer; bool getEventsTimerSetFlag; Modified: store/trunk/cpp/tests/python_tests/client_persistence.py =================================================================== --- store/trunk/cpp/tests/python_tests/client_persistence.py 2011-03-04 18:57:42 UTC (rev 4446) +++ store/trunk/cpp/tests/python_tests/client_persistence.py 2011-03-21 17:50:21 UTC (rev 4447) @@ -49,12 +49,12 @@ ssn = broker.connect().session() snd1 = ssn.sender("abc/key1; {create:always, node:{type:topic, durable:True}}") snd2 = ssn.sender("abc/key2; {create:always, node:{type:topic, durable:True}}") - ssn.receiver("a; {create:always, link:{durable:True, x-bindings:[{exchange:abc, key:key1}]}}") - ssn.receiver("b; {create:always, link:{durable:True, x-bindings:[{exchange:abc, key:key1}]}}") - ssn.receiver("c; {create:always, link:{durable:True, x-bindings:[{exchange:abc, key:key1}, " - "{exchange:abc, key: key2}]}}") - ssn.receiver("d; {create:always, link:{durable:True, x-bindings:[{exchange:abc, key:key2}]}}") - ssn.receiver("e; {create:always, link:{durable:True, x-bindings:[{exchange:abc, key:key2}]}}") + ssn.receiver("a; {create:always, link:{x-bindings:[{exchange:abc, key:key1}]}, node:{durable:True}}") + ssn.receiver("b; {create:always, link:{x-bindings:[{exchange:abc, key:key1}]}, node:{durable:True}}") + ssn.receiver("c; {create:always, link:{x-bindings:[{exchange:abc, key:key1}, " + "{exchange:abc, key: key2}]}, node:{durable:True}}") + ssn.receiver("d; {create:always, link:{x-bindings:[{exchange:abc, key:key2}]}, node:{durable:True}}") + ssn.receiver("e; {create:always, link:{x-bindings:[{exchange:abc, key:key2}]}, node:{durable:True}}") msg1 = Message("Message1", durable=True, correlation_id="Msg0003") snd1.send(msg1) msg2 = Message("Message2", durable=True, correlation_id="Msg0004") Modified: store/trunk/cpp/tests/run_python_tests =================================================================== --- store/trunk/cpp/tests/run_python_tests 2011-03-04 18:57:42 UTC (rev 4446) +++ store/trunk/cpp/tests/run_python_tests 2011-03-21 17:50:21 UTC (rev 4447) @@ -58,7 +58,7 @@ # To debug a test, add the following options to the end of the following line: # -v DEBUG -c qpid.messaging.io.ops [*.testName] -${PYTHON_DIR}/qpid-python-test -m ${MODULENAME} -I ${FAILING_PYTHON_TESTS} ${PYTHON_TESTS} -DOUTDIR=$OUTDIR +${PYTHON_DIR}/qpid-python-test -m ${MODULENAME} -I ${FAILING_PYTHON_TESTS} ${PYTHON_TESTS} -DOUTDIR=$OUTDIR #-v DEBUG RETCODE=$? if test x${RETCODE} != x0; then

13 years, 9 months

1
0
0 / 0

rhmessaging commits: r4446 - store/trunk/cpp/lib.

by rhmessaging-commits＠lists.jboss.org

Author: aconway Date: 2011-03-04 13:57:42 -0500 (Fri, 04 Mar 2011) New Revision: 4446 Modified: store/trunk/cpp/lib/StorePlugin.cpp Log: Disable management of store and journal in a cluster. The store updates statistics and properties of store and journal managed objects in timer threads, which can create inconsistencies in a cluster. Modified: store/trunk/cpp/lib/StorePlugin.cpp =================================================================== --- store/trunk/cpp/lib/StorePlugin.cpp 2011-03-01 20:08:48 UTC (rev 4445) +++ store/trunk/cpp/lib/StorePlugin.cpp 2011-03-04 18:57:42 UTC (rev 4446) @@ -25,8 +25,10 @@ #include "qpid/Plugin.h" #include "qpid/Options.h" #include "qpid/DataDir.h" +#include "qpid/log/Statement.h" #include "MessageStoreImpl.h" +using mrg::msgstore::MessageStoreImpl; namespace qpid { namespace broker { @@ -35,7 +37,7 @@ struct StorePlugin : public Plugin { - mrg::msgstore::MessageStoreImpl::StoreOptions options; + MessageStoreImpl::StoreOptions options; Options* getOptions() { return &options; } @@ -43,7 +45,7 @@ { Broker* broker = dynamic_cast<Broker*>(&target); if (!broker) return; - boost::shared_ptr<qpid::broker::MessageStore> store(new mrg::msgstore::MessageStoreImpl (broker->getTimer())); + boost::shared_ptr<MessageStoreImpl> store(new MessageStoreImpl(broker->getTimer())); DataDir& dataDir = broker->getDataDir (); if (options.storeDir.empty ()) { @@ -52,16 +54,25 @@ options.storeDir = dataDir.getPath (); } - MessageStore* sp = store.get(); - static_cast<mrg::msgstore::MessageStoreImpl*>(sp)->init(&options); - broker->setStore (store); + store->init(&options); + boost::shared_ptr<qpid::broker::MessageStore> brokerStore(store); + broker->setStore(brokerStore); target.addFinalizer(boost::bind(&StorePlugin::finalize, this)); - static_cast<mrg::msgstore::MessageStoreImpl*>(sp)->initManagement(broker); } - void initialize(Plugin::Target&) + void initialize(Plugin::Target& target) { - // This function intentionally left blank + Broker* broker = dynamic_cast<Broker*>(&target); + if (!broker) return; + MessageStoreImpl* store=dynamic_cast<MessageStoreImpl*>(&broker->getStore()); + if (!store) return; + // Not done in earlyInitialize as the Broker::isInCluster test won't work there. + if (broker->isInCluster()) { + QPID_LOG(info, "Disabling management instrumentation for the store in a cluster."); + } else { + QPID_LOG(info, "Enabling management instrumentation for the store."); + store->initManagement(broker); + } } void finalize()

13 years, 9 months

1
0
0 / 0

rhmessaging commits: r4445 - in store/trunk/cpp: tests/cluster and 1 other directory.

by rhmessaging-commits＠lists.jboss.org

Author: aconway Date: 2011-03-01 15:08:48 -0500 (Tue, 01 Mar 2011) New Revision: 4445 Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp store/trunk/cpp/tests/cluster/run_python_cluster_tests Log: Bug 681026 - Clustered broker exits with invalid-argument error. In a normal start-up the TplStore had no management object becase it was created before the management infrastructure. In a cluster start-up when joining an existing cluster and truncating the store, the TplStore was created after the management infrastructure and so did have a management object. This could create a cluster inconsistency. The fix is to never create a management object for the TplStore. Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp =================================================================== --- store/trunk/cpp/lib/MessageStoreImpl.cpp 2011-02-25 16:42:06 UTC (rev 4444) +++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2011-03-01 20:08:48 UTC (rev 4445) @@ -355,8 +355,10 @@ open(generalDb, txn.get(), "general.db", false); txn.commit(); } catch (...) { txn.abort(); throw; } - - tplStorePtr.reset(new TplJournalImpl(timer, "TplStore", getTplBaseDir(), "tpl", defJournalGetEventsTimeout, defJournalFlushTimeout, agent)); + // NOTE: during normal initialization, agent == 0 because the store is initialized before the management infrastructure. + // However during a truncated initialization in a cluster, agent != 0. We always pass 0 as the agent for the + // TplStore to keep things consistent in a cluster. See https://bugzilla.redhat.com/show_bug.cgi?id=681026 + tplStorePtr.reset(new TplJournalImpl(timer, "TplStore", getTplBaseDir(), "tpl", defJournalGetEventsTimeout, defJournalFlushTimeout, 0)); isInit = true; } catch (const DbException& e) { if (e.get_errno() == DB_VERSION_MISMATCH) Modified: store/trunk/cpp/tests/cluster/run_python_cluster_tests =================================================================== --- store/trunk/cpp/tests/cluster/run_python_cluster_tests 2011-02-25 16:42:06 UTC (rev 4444) +++ store/trunk/cpp/tests/cluster/run_python_cluster_tests 2011-03-01 20:08:48 UTC (rev 4445) @@ -39,19 +39,4 @@ TEST_CMD="${QPID_PYTHON_TEST} -m cluster_tests ${CLUSTER_TESTS_IGNORE} ${CLUSTER_TESTS} -DOUTDIR=$OUTDIR" -if test $COROSYNC; then - $TEST_CMD - RETCODE=$? -else - sg ais -c "$TEST_CMD" - RETCODE=$? -fi - -if test x${RETCODE} != x0; then - exit 1; -fi -rm -rf $OUTDIR - -../clean.sh - -exit 0 +$TEST_CMD && rm -rf $OUTDIR

13 years, 9 months

1
0
0 / 0

← Newer
1
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

rhmessaging-commits March 2011