Ensure that if no store is loaded we don't flow to disk, but revert to rejecting messages.

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

4 files changed, 49 insertions, 4 deletions

diff --git a/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp b/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
index 20f5b98b6b..96186d508b 100644
--- a/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
+++ b/qpid/cpp/src/qpid/broker/MessageStoreModule.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "MessageStoreModule.h"
+#include "NullMessageStore.h"
 #include <iostream>
 
 // This transfer protects against the unloading of the store lib prior to the handling of the exception
@@ -165,4 +166,9 @@ void MessageStoreModule::collectPreparedXids(std::set<std::string>& xids)
     TRANSFER_EXCEPTION(store->collectPreparedXids(xids));
 }
 
+bool MessageStoreModule::isNull() const
+{
+    return NullMessageStore::isNullStore(store);
+}
+
 }} // namespace qpid::broker
diff --git a/qpid/cpp/src/qpid/broker/MessageStoreModule.h b/qpid/cpp/src/qpid/broker/MessageStoreModule.h
index a16ef4de21..0b51610a46 100644
--- a/qpid/cpp/src/qpid/broker/MessageStoreModule.h
+++ b/qpid/cpp/src/qpid/broker/MessageStoreModule.h
@@ -73,7 +73,8 @@ class MessageStoreModule : public MessageStore
                  const PersistableQueue& queue);
     uint32_t outstandingQueueAIO(const PersistableQueue& queue);
     void flush(const qpid::broker::PersistableQueue& queue);
-	 
+    bool isNull() const;
+
     ~MessageStoreModule();
 };
 
diff --git a/qpid/cpp/src/qpid/broker/NullMessageStore.cpp b/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
index 4c13c2adef..ad0143ce43 100644
--- a/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
+++ b/qpid/cpp/src/qpid/broker/NullMessageStore.cpp
@@ -20,8 +20,10 @@
  */
 
 #include "NullMessageStore.h"
+#include "MessageStoreModule.h"
 #include "RecoveryManager.h"
 #include "qpid/log/Statement.h"
+#include "qpid/framing/reply_exceptions.h"
 
 #include <iostream>
 
@@ -90,7 +92,10 @@ void NullMessageStore::appendContent(const intrusive_ptr<const PersistableMessag
 
 void NullMessageStore::loadContent(const qpid::broker::PersistableQueue&,
                                    const intrusive_ptr<const PersistableMessage>&,
-                                   string&, uint64_t, uint32_t) {}
+                                   string&, uint64_t, uint32_t) 
+{
+    throw qpid::framing::InternalErrorException("Can't load content; persistence not enabled");
+}
 
 void NullMessageStore::enqueue(TransactionContext*,
                                const intrusive_ptr<PersistableMessage>& msg,
@@ -149,8 +154,13 @@ bool NullMessageStore::isNull() const
 
 bool NullMessageStore::isNullStore(const MessageStore* store)
 {
-    const NullMessageStore* test = dynamic_cast<const NullMessageStore*>(store);
-    return test && test->isNull();
+    const MessageStoreModule* wrapper = dynamic_cast<const MessageStoreModule*>(store);
+    if (wrapper) {
+        return wrapper->isNull();
+    } else {
+        const NullMessageStore* test = dynamic_cast<const NullMessageStore*>(store);
+        return test && test->isNull();
+    }
 }
 
 }}  // namespace qpid::broker
diff --git a/qpid/cpp/src/tests/QueuePolicyTest.cpp b/qpid/cpp/src/tests/QueuePolicyTest.cpp
index e72f7b2ce3..6c650169c7 100644
--- a/qpid/cpp/src/tests/QueuePolicyTest.cpp
+++ b/qpid/cpp/src/tests/QueuePolicyTest.cpp
@@ -22,6 +22,7 @@
 #include "test_tools.h"
 
 #include "qpid/broker/QueuePolicy.h"
+#include "qpid/client/QueueOptions.h"
 #include "qpid/sys/Time.h"
 #include "qpid/framing/reply_exceptions.h"
 #include "MessageUtils.h"
@@ -242,5 +243,32 @@ QPID_AUTO_TEST_CASE(testPolicyWithDtx)
     other.messageTransfer(arg::content=client::Message("Message_6", q));
 }
 
+QPID_AUTO_TEST_CASE(testFlowToDiskWithNoStore) 
+{
+    //Ensure that with no store loaded, we don't flow to disk but
+    //fallback to rejecting messages
+    QueueOptions args;
+    args.setSizePolicy(FLOW_TO_DISK, 0, 5);
+
+    ProxySessionFixture f;
+    std::string q("my-queue");
+    f.session.queueDeclare(arg::queue=q, arg::exclusive=true, arg::autoDelete=true, arg::arguments=args);
+    LocalQueue incoming;
+    SubscriptionSettings settings(FlowControl::unlimited());
+    settings.autoAck = 0; // no auto ack.
+    Subscription sub = f.subs.subscribe(incoming, q, settings); 
+    for (int i = 0; i < 5; i++) {
+        f.session.messageTransfer(arg::content=client::Message((boost::format("%1%_%2%") % "Message" % (i+1)).str(), q));
+    }
+    for (int i = 0; i < 5; i++) {
+        BOOST_CHECK_EQUAL(incoming.pop().getData(), (boost::format("%1%_%2%") % "Message" % (i+1)).str());
+    }
+    try {
+        ScopedSuppressLogging sl; // Suppress messages for expected errors.
+        f.session.messageTransfer(arg::content=client::Message("Message_6", q));
+        BOOST_FAIL("expecting ResourceLimitExceededException.");
+    } catch (const ResourceLimitExceededException&) {}    
+}
+
 
 QPID_AUTO_TEST_SUITE_END()