diff options
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Queue.cpp | 31 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Queue.h | 9 |
2 files changed, 0 insertions, 40 deletions
diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp index cbc5c86dad..e1782b01ce 100644 --- a/qpid/cpp/src/qpid/broker/Queue.cpp +++ b/qpid/cpp/src/qpid/broker/Queue.cpp @@ -178,8 +178,6 @@ Queue::Queue(const string& _name, const QueueSettings& _settings, consumerCount(0), browserCount(0), exclusive(0), - persistLastNode(false), - inLastNodeFailure(false), messages(new MessageDeque()), persistenceId(0), settings(b ? merge(_settings, b->getOptions()) : _settings), @@ -795,31 +793,6 @@ bool Queue::canAutoDelete() const return settings.autodelete && !consumerCount && !owner; } -void Queue::clearLastNodeFailure() -{ - inLastNodeFailure = false; -} - -void Queue::forcePersistent(const Message& /*message*/) -{ - //TODO -} - -void Queue::setLastNodeFailure() -{ - if (persistLastNode){ - Mutex::ScopedLock locker(messageLock); - try { - messages->foreach(boost::bind(&Queue::forcePersistent, this, _1)); - } catch (const std::exception& e) { - // Could not go into last node standing (for example journal not large enough) - QPID_LOG(error, "Unable to fail to last node standing for queue: " << name << " : " << e.what()); - } - inLastNodeFailure = true; - } -} - - /* * return true if enqueue succeeded and message should be made * available; returning false will result in the message being dropped @@ -837,10 +810,6 @@ bool Queue::enqueue(TransactionContext* ctxt, Message& msg) } } - if (inLastNodeFailure && persistLastNode){ - forcePersistent(msg); - } - if (settings.traceId.size()) { msg.addTraceId(settings.traceId); } diff --git a/qpid/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h index 8b8ef442b2..29b711075a 100644 --- a/qpid/cpp/src/qpid/broker/Queue.h +++ b/qpid/cpp/src/qpid/broker/Queue.h @@ -129,8 +129,6 @@ class Queue : public boost::enable_shared_from_this<Queue>, uint32_t consumerCount; // Actually a count of all subscriptions, acquiring or not. uint32_t browserCount; // Count of non-acquiring subscriptions. OwnershipToken* exclusive; - bool persistLastNode; - bool inLastNodeFailure; std::vector<std::string> traceExclude; QueueListeners listeners; std::auto_ptr<Messages> messages; @@ -200,7 +198,6 @@ class Queue : public boost::enable_shared_from_this<Queue>, bool acquire(const qpid::framing::SequenceNumber& position, Message& msg, const qpid::sys::Mutex::ScopedLock& locker); - void forcePersistent(const Message& msg); int getEventMode(); void dequeueFromStore(boost::intrusive_ptr<PersistableMessage>); void abandoned(const Message& message); @@ -314,12 +311,6 @@ class Queue : public boost::enable_shared_from_this<Queue>, const QueueBindings& getBindings() const { return bindings; } /** - * used to take messages from in memory and flush down to disk. - */ - QPID_BROKER_EXTERN void setLastNodeFailure(); - QPID_BROKER_EXTERN void clearLastNodeFailure(); - - /** * dequeue from store (only done once messages is acknowledged) */ QPID_BROKER_EXTERN void dequeue(TransactionContext* ctxt, const QueueCursor&); |