rhmessaging commits: r4510 - store/tags.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2012-05-29 11:46:20 -0400 (Tue, 29 May 2012)
New Revision: 4510
Added:
store/tags/qpid-0.16-release/
Log:
Created tag for Qpid 0.16 build
12 years, 6 months
rhmessaging commits: r4509 - store/trunk/cpp/tests.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2012-05-29 11:14:32 -0400 (Tue, 29 May 2012)
New Revision: 4509
Modified:
store/trunk/cpp/tests/MessageUtils.h
store/trunk/cpp/tests/OrderingTest.cpp
Log:
Solved compile problems stemming from cleanup of namespace pollution in recent qpid checkins
Modified: store/trunk/cpp/tests/MessageUtils.h
===================================================================
--- store/trunk/cpp/tests/MessageUtils.h 2012-05-08 15:39:54 UTC (rev 4508)
+++ store/trunk/cpp/tests/MessageUtils.h 2012-05-29 15:14:32 UTC (rev 4509)
@@ -31,7 +31,7 @@
struct MessageUtils
{
- static boost::intrusive_ptr<Message> createMessage(const string& exchange, const string& routingKey,
+ static boost::intrusive_ptr<Message> createMessage(const std::string& exchange, const std::string& routingKey,
const Uuid& messageId=Uuid(), const bool persistent = false,
const uint64_t contentSize = 0, const std::string& correlationId = std::string())
{
@@ -53,7 +53,7 @@
return msg;
}
- static void addContent(boost::intrusive_ptr<Message> msg, const string& data)
+ static void addContent(boost::intrusive_ptr<Message> msg, const std::string& data)
{
AMQFrame content((AMQContentBody(data)));
msg->getFrames().append(content);
Modified: store/trunk/cpp/tests/OrderingTest.cpp
===================================================================
--- store/trunk/cpp/tests/OrderingTest.cpp 2012-05-08 15:39:54 UTC (rev 4508)
+++ store/trunk/cpp/tests/OrderingTest.cpp 2012-05-29 15:14:32 UTC (rev 4509)
@@ -53,7 +53,7 @@
// === Helper fns ===
-const string name("OrderingQueue");
+const std::string name("OrderingQueue");
std::auto_ptr<MessageStoreImpl> store;
QueueRegistry queues;
Queue::shared_ptr queue;
12 years, 6 months
rhmessaging commits: r4508 - in store/trunk/cpp: tests and 2 other directories.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2012-05-08 11:39:54 -0400 (Tue, 08 May 2012)
New Revision: 4508
Modified:
store/trunk/cpp/configure.ac
store/trunk/cpp/tests/federation/Makefile.am
store/trunk/cpp/tests/federation/run_federation_sys_tests
store/trunk/cpp/tests/persistence.py
store/trunk/cpp/tests/python_tests/client_persistence.py
store/trunk/cpp/tests/python_tests/store_test.py
Log:
More store test fixes
Modified: store/trunk/cpp/configure.ac
===================================================================
--- store/trunk/cpp/configure.ac 2012-05-07 12:59:09 UTC (rev 4507)
+++ store/trunk/cpp/configure.ac 2012-05-08 15:39:54 UTC (rev 4508)
@@ -138,8 +138,10 @@
# Check for cluster module to see whether to enable cluster tests
AC_MSG_CHECKING([presence of qpid cluster module])
found_cluster_so=no
-if test x$with_qpid_checkout != x -a -f $QPID_SRC/.libs/cluster.so ; then
+if test x$with_qpid_build != x -a -f $QPID_BLD/src/.libs/cluster.so ; then
found_cluster_so=yes
+elif test x$with_qpid_checkout != x -a -f $QPID_SRC/.libs/cluster.so ; then
+ found_cluster_so=yes
elif test -f $QPID_LIB/qpid/daemon/cluster.so ; then
found_cluster_so=yes
fi
Modified: store/trunk/cpp/tests/federation/Makefile.am
===================================================================
--- store/trunk/cpp/tests/federation/Makefile.am 2012-05-07 12:59:09 UTC (rev 4507)
+++ store/trunk/cpp/tests/federation/Makefile.am 2012-05-08 15:39:54 UTC (rev 4508)
@@ -20,7 +20,6 @@
# The GNU Lesser General Public License is available in the file COPYING.
-abs_builddir=@abs_builddir@
abs_srcdir=@abs_srcdir@
TMP_DATA_DIR=$(abs_srcdir)/../tmp_data_dir
@@ -40,8 +39,7 @@
QPID_DIR=$(QPID_DIR) \
QPID_BLD=$(QPID_BLD) \
TMP_DATA_DIR=$(TMP_DATA_DIR) \
- abs_srcdir=$(abs_srcdir) \
- abs_builddir=$(abs_builddir)
+ abs_srcdir=$(abs_srcdir)
check-long: all
$(MAKE) check TESTS="$(LONG_TESTS)" SUBDIRS=.
Modified: store/trunk/cpp/tests/federation/run_federation_sys_tests
===================================================================
--- store/trunk/cpp/tests/federation/run_federation_sys_tests 2012-05-07 12:59:09 UTC (rev 4507)
+++ store/trunk/cpp/tests/federation/run_federation_sys_tests 2012-05-08 15:39:54 UTC (rev 4508)
@@ -23,9 +23,8 @@
# Run the federation tests.
+source ${abs_srcdir}/federation_tests_env.sh
-source ./federation_tests_env.sh
-
MODULENAME=federation_sys
# Test for long test
Modified: store/trunk/cpp/tests/persistence.py
===================================================================
--- store/trunk/cpp/tests/persistence.py 2012-05-07 12:59:09 UTC (rev 4507)
+++ store/trunk/cpp/tests/persistence.py 2012-05-08 15:39:54 UTC (rev 4508)
@@ -64,13 +64,13 @@
session.message_transfer(destination="amq.direct",
message=self.createMessage(routing_key="b", correlation_id="Msg0002", body="B_Message1"))
- session.queue_declare(queue="lvq-test", durable=True, arguments={"qpid.last_value_queue":True})
- session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"B"}, body="B1"))
- session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A1"))
- session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A2"))
- session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"B"}, body="B2"))
- session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"B"}, body="B3"))
- session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C1"))
+# session.queue_declare(queue="lvq-test", durable=True, arguments={"qpid.last_value_queue":True})
+# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"B"}, body="B1"))
+# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A1"))
+# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A2"))
+# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"B"}, body="B2"))
+# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"B"}, body="B3"))
+# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C1"))
@@ -108,51 +108,51 @@
session.message_transfer(destination="amq.topic",
message=self.createMessage(routing_key="abc", correlation_id="Msg0003", body="AB_Message2"))
- #check LVQ exists and has exepected messages:
- session.queue_declare(queue="lvq-test", durable=True, passive=True)
- session.message_subscribe(destination="lvq", queue="lvq-test")
- lvq = session.incoming("lvq")
- lvq.start()
- accepted = RangedSet()
- for m in ["A2", "B3", "C1"]:
- msg = lvq.get(timeout=1)
- self.assertEquals(m, msg.body)
- accepted.add(msg.id)
- try:
- extra = lvq.get(timeout=1)
- self.fail("lvq-test not empty, contains: " + extra.body)
- except Empty: None
- #publish some more messages while subscriber is active (no replacement):
- session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C2"))
- session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C3"))
- session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A3"))
- session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A4"))
- session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C4"))
- #check that accepting replaced messages is safe
- session.message_accept(accepted)
+# #check LVQ exists and has exepected messages:
+# session.queue_declare(queue="lvq-test", durable=True, passive=True)
+# session.message_subscribe(destination="lvq", queue="lvq-test")
+# lvq = session.incoming("lvq")
+# lvq.start()
+# accepted = RangedSet()
+# for m in ["A2", "B3", "C1"]:
+# msg = lvq.get(timeout=1)
+# self.assertEquals(m, msg.body)
+# accepted.add(msg.id)
+# try:
+# extra = lvq.get(timeout=1)
+# self.fail("lvq-test not empty, contains: " + extra.body)
+# except Empty: None
+# #publish some more messages while subscriber is active (no replacement):
+# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C2"))
+# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C3"))
+# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A3"))
+# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"A"}, body="A4"))
+# session.message_transfer(message=self.createMessage(routing_key="lvq-test", application_headers={"qpid.LVQ_key":"C"}, body="C4"))
+# #check that accepting replaced messages is safe
+# session.message_accept(accepted)
def phase3(self):
session = self.session
- #lvq recovery validation
- session.queue_declare(queue="lvq-test", durable=True, passive=True)
- session.message_subscribe(destination="lvq", queue="lvq-test")
- lvq = session.incoming("lvq")
- lvq.start()
- accepted = RangedSet()
- lvq.start()
- for m in ["C4", "A4"]:
- msg = lvq.get(timeout=1)
- self.assertEquals(m, msg.body)
- accepted.add(msg.id)
- session.message_accept(accepted)
- try:
- extra = lvq.get(timeout=1)
- self.fail("lvq-test not empty, contains: " + extra.body)
- except Empty: None
- session.message_cancel(destination="lvq")
- session.queue_delete(queue="lvq-test")
+# #lvq recovery validation
+# session.queue_declare(queue="lvq-test", durable=True, passive=True)
+# session.message_subscribe(destination="lvq", queue="lvq-test")
+# lvq = session.incoming("lvq")
+# lvq.start()
+# accepted = RangedSet()
+# lvq.start()
+# for m in ["C4", "A4"]:
+# msg = lvq.get(timeout=1)
+# self.assertEquals(m, msg.body)
+# accepted.add(msg.id)
+# session.message_accept(accepted)
+# try:
+# extra = lvq.get(timeout=1)
+# self.fail("lvq-test not empty, contains: " + extra.body)
+# except Empty: None
+# session.message_cancel(destination="lvq")
+# session.queue_delete(queue="lvq-test")
#check queues exists
Modified: store/trunk/cpp/tests/python_tests/client_persistence.py
===================================================================
--- store/trunk/cpp/tests/python_tests/client_persistence.py 2012-05-07 12:59:09 UTC (rev 4507)
+++ store/trunk/cpp/tests/python_tests/client_persistence.py 2012-05-08 15:39:54 UTC (rev 4508)
@@ -69,8 +69,8 @@
self.check_message(broker, "e", msg2, True)
- def test_lvq(self):
- """Test LVQ."""
+ def test_legacy_lvq(self):
+ """Test legacy LVQ."""
broker = self.broker(store_args(), name="test_lvq", expect=EXPECT_EXIT_OK)
ma1 = Message("A1", durable=True, correlation_id="Msg0005", properties={"qpid.LVQ_key":"A"})
ma2 = Message("A2", durable=True, correlation_id="Msg0006", properties={"qpid.LVQ_key":"A"})
@@ -95,8 +95,9 @@
broker.terminate()
broker = self.broker(store_args(), name="test_lvq")
- self.check_messages(broker, "lvq-test", [mc4, ma4], True)
-
+ self.check_messages(broker, "lvq-test", [ma4, mc4], True)
+
+
def test_fanout_exchange(self):
"""Test Fanout Exchange"""
broker = self.broker(store_args(), name="test_fanout_exchange", expect=EXPECT_EXIT_OK)
Modified: store/trunk/cpp/tests/python_tests/store_test.py
===================================================================
--- store/trunk/cpp/tests/python_tests/store_test.py 2012-05-07 12:59:09 UTC (rev 4507)
+++ store/trunk/cpp/tests/python_tests/store_test.py 2012-05-08 15:39:54 UTC (rev 4508)
@@ -341,6 +341,7 @@
if transactional:
ssn.commit()
return ssn
+
# Functions for finding strings in the broker log file (or other files)
12 years, 7 months
rhmessaging commits: r4507 - in store/trunk/cpp/tests: python_tests and 1 other directory.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2012-05-07 08:59:09 -0400 (Mon, 07 May 2012)
New Revision: 4507
Modified:
store/trunk/cpp/tests/SimpleTest.cpp
store/trunk/cpp/tests/python_tests/resize.py
Log:
Fix for resize python tests when used on out-of-tree builds. Also fix for recent qpid header reorganization which created a compile error in SimpleTest.cpp.
Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp 2012-05-04 13:04:22 UTC (rev 4506)
+++ store/trunk/cpp/tests/SimpleTest.cpp 2012-05-07 12:59:09 UTC (rev 4507)
@@ -31,6 +31,7 @@
#include <qpid/broker/RecoveryManagerImpl.h>
#include <qpid/framing/AMQHeaderBody.h>
#include <qpid/framing/FieldTable.h>
+#include <qpid/framing/FieldValue.h>
#include "qpid/log/Logger.h"
#include "qpid/sys/Timer.h"
Modified: store/trunk/cpp/tests/python_tests/resize.py
===================================================================
--- store/trunk/cpp/tests/python_tests/resize.py 2012-05-04 13:04:22 UTC (rev 4506)
+++ store/trunk/cpp/tests/python_tests/resize.py 2012-05-07 12:59:09 UTC (rev 4507)
@@ -32,7 +32,8 @@
class ResizeTest(StoreTest):
- resize_tool = os.getenv("RESIZE_TOOL", "../../../tools/resize")
+ src_dir = os.getenv("abs_srcdir")
+ resize_tool = os.getenv("RESIZE_TOOL", src_dir + "/../tools/resize")
def _resize_store(self, store_dir, queue_name, resize_num_files, resize_file_size, exp_fail):
for f in glob.glob(os.path.join(store_dir, "*")):
12 years, 7 months
rhmessaging commits: r4506 - store/trunk/cpp/lib.
by rhmessaging-commits＠lists.jboss.org
Author: kpvdr
Date: 2012-05-04 09:04:22 -0400 (Fri, 04 May 2012)
New Revision: 4506
Modified:
store/trunk/cpp/lib/MessageStoreImpl.cpp
Log:
Added missing includes in qpid/framing as a result of the rearrangement of includes in qpid
Modified: store/trunk/cpp/lib/MessageStoreImpl.cpp
===================================================================
--- store/trunk/cpp/lib/MessageStoreImpl.cpp 2012-04-10 01:07:33 UTC (rev 4505)
+++ store/trunk/cpp/lib/MessageStoreImpl.cpp 2012-05-04 13:04:22 UTC (rev 4506)
@@ -27,10 +27,12 @@
#include "BufferValue.h"
#include "IdDbt.h"
#include "jrnl/txn_map.hpp"
+#include "qpid/framing/FieldValue.h"
#include "qpid/log/Statement.h"
#include "qmf/com/redhat/rhm/store/Package.h"
#include "StoreException.h"
#include <dirent.h>
+#include <db.h>
#define MAX_AIO_SLEEPS 100000 // tot: ~1 sec
#define AIO_SLEEP_TIME_US 10 // 0.01 ms
@@ -48,33 +50,33 @@
qpid::sys::Mutex TxnCtxt::globalSerialiser;
MessageStoreImpl::TplRecoverStruct::TplRecoverStruct(const u_int64_t _rid,
- const bool _deq_flag,
- const bool _commit_flag,
- const bool _tpc_flag) :
- rid(_rid),
- deq_flag(_deq_flag),
- commit_flag(_commit_flag),
- tpc_flag(_tpc_flag)
+ const bool _deq_flag,
+ const bool _commit_flag,
+ const bool _tpc_flag) :
+ rid(_rid),
+ deq_flag(_deq_flag),
+ commit_flag(_commit_flag),
+ tpc_flag(_tpc_flag)
{}
MessageStoreImpl::MessageStoreImpl(qpid::sys::Timer& timer_, const char* envpath) :
- numJrnlFiles(0),
- autoJrnlExpand(false),
- autoJrnlExpandMaxFiles(0),
- jrnlFsizeSblks(0),
- truncateFlag(false),
- wCachePgSizeSblks(0),
- wCacheNumPages(0),
- tplNumJrnlFiles(0),
- tplJrnlFsizeSblks(0),
- tplWCachePgSizeSblks(0),
- tplWCacheNumPages(0),
- highestRid(0),
- isInit(false),
- envPath(envpath),
- timer(timer_),
- mgmtObject(0),
- agent(0)
+ numJrnlFiles(0),
+ autoJrnlExpand(false),
+ autoJrnlExpandMaxFiles(0),
+ jrnlFsizeSblks(0),
+ truncateFlag(false),
+ wCachePgSizeSblks(0),
+ wCacheNumPages(0),
+ tplNumJrnlFiles(0),
+ tplJrnlFsizeSblks(0),
+ tplWCachePgSizeSblks(0),
+ tplWCacheNumPages(0),
+ highestRid(0),
+ isInit(false),
+ envPath(envpath),
+ timer(timer_),
+ mgmtObject(0),
+ agent(0)
{}
u_int16_t MessageStoreImpl::chkJrnlNumFilesParam(const u_int16_t param, const std::string paramName)
12 years, 7 months