Joint checkin from gsim, kpvdr, cctrieloff. See QPID-2102: Exceeding reject queue policy under a transaction causes broker crash

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@817742 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 37 insertions, 21 deletions

diff --git a/cpp/src/tests/QueuePolicyTest.cpp b/cpp/src/tests/QueuePolicyTest.cpp
index f40d30b588..875976db85 100644
--- a/cpp/src/tests/QueuePolicyTest.cpp
+++ b/cpp/src/tests/QueuePolicyTest.cpp
@@ -48,56 +48,56 @@ QueuedMessage createMessage(uint32_t size)
 
 QPID_AUTO_TEST_CASE(testCount)
 {
-    std::auto_ptr<QueuePolicy> policy(QueuePolicy::createQueuePolicy(5, 0));
+    std::auto_ptr<QueuePolicy> policy(QueuePolicy::createQueuePolicy("test", 5, 0));
     BOOST_CHECK_EQUAL((uint64_t) 0, policy->getMaxSize());
     BOOST_CHECK_EQUAL((uint32_t) 5, policy->getMaxCount());
 
     QueuedMessage msg = createMessage(10);
     for (size_t i = 0; i < 5; i++) {
-        policy->tryEnqueue(msg);
+        policy->tryEnqueue(msg.payload);
     }
     try {
-        policy->tryEnqueue(msg);
+        policy->tryEnqueue(msg.payload);
         BOOST_FAIL("Policy did not fail on enqueuing sixth message");
     } catch (const ResourceLimitExceededException&) {}
 
     policy->dequeued(msg);
-    policy->tryEnqueue(msg);
+    policy->tryEnqueue(msg.payload);
 
     try {
-        policy->tryEnqueue(msg);
+        policy->tryEnqueue(msg.payload);
         BOOST_FAIL("Policy did not fail on enqueuing sixth message (after dequeue)");
     } catch (const ResourceLimitExceededException&) {}
 }
 
 QPID_AUTO_TEST_CASE(testSize)
 {
-    std::auto_ptr<QueuePolicy> policy(QueuePolicy::createQueuePolicy(0, 50));
+    std::auto_ptr<QueuePolicy> policy(QueuePolicy::createQueuePolicy("test", 0, 50));
     QueuedMessage msg = createMessage(10);
 
     for (size_t i = 0; i < 5; i++) {
-        policy->tryEnqueue(msg);
+        policy->tryEnqueue(msg.payload);
     }
     try {
-        policy->tryEnqueue(msg);
+        policy->tryEnqueue(msg.payload);
         BOOST_FAIL("Policy did not fail on aggregate size exceeding 50. " << *policy);
     } catch (const ResourceLimitExceededException&) {}
 
     policy->dequeued(msg);
-    policy->tryEnqueue(msg);
+    policy->tryEnqueue(msg.payload);
 
     try {
-        policy->tryEnqueue(msg);
+        policy->tryEnqueue(msg.payload);
         BOOST_FAIL("Policy did not fail on aggregate size exceeding 50 (after dequeue). " << *policy);
     } catch (const ResourceLimitExceededException&) {}
 }
 
 QPID_AUTO_TEST_CASE(testBoth)
 {
-    std::auto_ptr<QueuePolicy> policy(QueuePolicy::createQueuePolicy(5, 50));
+    std::auto_ptr<QueuePolicy> policy(QueuePolicy::createQueuePolicy("test", 5, 50));
     try {
         QueuedMessage msg = createMessage(51);
-        policy->tryEnqueue(msg);
+        policy->tryEnqueue(msg.payload);
         BOOST_FAIL("Policy did not fail on single message exceeding 50. " << *policy);
     } catch (const ResourceLimitExceededException&) {}
 
@@ -108,17 +108,17 @@ QPID_AUTO_TEST_CASE(testBoth)
     messages.push_back(createMessage(2));
     messages.push_back(createMessage(7));
     for (size_t i = 0; i < messages.size(); i++) {
-        policy->tryEnqueue(messages[i]);
+        policy->tryEnqueue(messages[i].payload);
     }
     //size = 45 at this point, count = 5
     try {
         QueuedMessage msg = createMessage(5);
-        policy->tryEnqueue(msg);
+        policy->tryEnqueue(msg.payload);
         BOOST_FAIL("Policy did not fail on count exceeding 6. " << *policy);
     } catch (const ResourceLimitExceededException&) {}
     try {
         QueuedMessage msg = createMessage(10);
-        policy->tryEnqueue(msg);
+        policy->tryEnqueue(msg.payload);
         BOOST_FAIL("Policy did not fail on aggregate size exceeding 50. " << *policy);
     } catch (const ResourceLimitExceededException&) {}
 
@@ -126,7 +126,7 @@ QPID_AUTO_TEST_CASE(testBoth)
     policy->dequeued(messages[0]);
     try {
         QueuedMessage msg = createMessage(20);
-        policy->tryEnqueue(msg);
+        policy->tryEnqueue(msg.payload);
     } catch (const ResourceLimitExceededException&) {
         BOOST_FAIL("Policy failed incorrectly after dequeue. " << *policy);
     }
@@ -135,10 +135,10 @@ QPID_AUTO_TEST_CASE(testBoth)
 QPID_AUTO_TEST_CASE(testSettings)
 {
     //test reading and writing the policy from/to field table
-    std::auto_ptr<QueuePolicy> a(QueuePolicy::createQueuePolicy(101, 303));
+    std::auto_ptr<QueuePolicy> a(QueuePolicy::createQueuePolicy("test", 101, 303));
     FieldTable settings;
     a->update(settings);
-    std::auto_ptr<QueuePolicy> b(QueuePolicy::createQueuePolicy(settings));
+    std::auto_ptr<QueuePolicy> b(QueuePolicy::createQueuePolicy("test", settings));
     BOOST_CHECK_EQUAL(a->getMaxCount(), b->getMaxCount());
     BOOST_CHECK_EQUAL(a->getMaxSize(), b->getMaxSize());
 }
@@ -146,7 +146,7 @@ QPID_AUTO_TEST_CASE(testSettings)
 QPID_AUTO_TEST_CASE(testRingPolicy)
 {
     FieldTable args;
-    std::auto_ptr<QueuePolicy> policy = QueuePolicy::createQueuePolicy(5, 0, QueuePolicy::RING);
+    std::auto_ptr<QueuePolicy> policy = QueuePolicy::createQueuePolicy("test", 5, 0, QueuePolicy::RING);
     policy->update(args);
 
     ProxySessionFixture f;
@@ -175,7 +175,7 @@ QPID_AUTO_TEST_CASE(testRingPolicy)
 QPID_AUTO_TEST_CASE(testStrictRingPolicy)
 {
     FieldTable args;
-    std::auto_ptr<QueuePolicy> policy = QueuePolicy::createQueuePolicy(5, 0, QueuePolicy::RING_STRICT);
+    std::auto_ptr<QueuePolicy> policy = QueuePolicy::createQueuePolicy("test", 5, 0, QueuePolicy::RING_STRICT);
     policy->update(args);
 
     ProxySessionFixture f;
@@ -201,7 +201,7 @@ QPID_AUTO_TEST_CASE(testStrictRingPolicy)
 QPID_AUTO_TEST_CASE(testPolicyWithDtx)
 {
     FieldTable args;
-    std::auto_ptr<QueuePolicy> policy = QueuePolicy::createQueuePolicy(5, 0, QueuePolicy::REJECT);
+    std::auto_ptr<QueuePolicy> policy = QueuePolicy::createQueuePolicy("test", 5, 0, QueuePolicy::REJECT);
     policy->update(args);
 
     ProxySessionFixture f;
@@ -282,6 +282,22 @@ QPID_AUTO_TEST_CASE(testFlowToDiskWithNoStore)
     } catch (const ResourceLimitExceededException&) {}
 }
 
+QPID_AUTO_TEST_CASE(testPolicyFailureOnCommit)
+{
+    FieldTable args;
+    std::auto_ptr<QueuePolicy> policy = QueuePolicy::createQueuePolicy("test", 5, 0, QueuePolicy::REJECT);
+    policy->update(args);
+
+    ProxySessionFixture f;
+    std::string q("q");
+    f.session.queueDeclare(arg::queue=q, arg::exclusive=true, arg::autoDelete=true, arg::arguments=args);
+    f.session.txSelect();
+    for (int i = 0; i < 10; i++) {
+        f.session.messageTransfer(arg::content=client::Message((boost::format("%1%_%2%") % "Message" % (i+1)).str(), q));
+    }
+    ScopedSuppressLogging sl; // Suppress messages for expected errors.
+    BOOST_CHECK_THROW(f.session.txCommit(), InternalErrorException);
+}
 
 QPID_AUTO_TEST_SUITE_END()