From 15a5da23e5a68edea6cd0056a63d988d5046bf8a Mon Sep 17 00:00:00 2001 From: "Carl C. Trieloff" Date: Wed, 8 Jul 2009 20:01:34 +0000 Subject: Fix to cover this case: 1. start two nodes 2. create cluster durable queue and add some messages 3. kill one node (trigger force-persistent behaviour) 4. stop and recover remaining node 5. add another node 6. kill that new node again git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@792285 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/PersistableMessage.cpp | 7 ++++++- cpp/src/qpid/broker/PersistableMessage.h | 3 +++ cpp/src/qpid/broker/Queue.cpp | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'cpp/src') diff --git a/cpp/src/qpid/broker/PersistableMessage.cpp b/cpp/src/qpid/broker/PersistableMessage.cpp index 2275009015..655179bfd4 100644 --- a/cpp/src/qpid/broker/PersistableMessage.cpp +++ b/cpp/src/qpid/broker/PersistableMessage.cpp @@ -100,13 +100,18 @@ bool PersistableMessage::isStoredOnQueue(PersistableQueue::shared_ptr queue){ return false; } -void PersistableMessage::enqueueAsync(PersistableQueue::shared_ptr queue, MessageStore* _store) { + +void PersistableMessage::addToSyncList(PersistableQueue::shared_ptr queue, MessageStore* _store) { if (_store){ sys::ScopedLock l(storeLock); store = _store; boost::weak_ptr q(queue); synclist.push_back(q); } +} + +void PersistableMessage::enqueueAsync(PersistableQueue::shared_ptr queue, MessageStore* _store) { + addToSyncList(queue, _store); enqueueAsync(); } diff --git a/cpp/src/qpid/broker/PersistableMessage.h b/cpp/src/qpid/broker/PersistableMessage.h index 98d9655862..17bf774377 100644 --- a/cpp/src/qpid/broker/PersistableMessage.h +++ b/cpp/src/qpid/broker/PersistableMessage.h @@ -113,6 +113,9 @@ class PersistableMessage : public Persistable QPID_BROKER_EXTERN void dequeueAsync(); bool isStoredOnQueue(PersistableQueue::shared_ptr queue); + + void addToSyncList(PersistableQueue::shared_ptr queue, MessageStore* _store); + }; }} diff --git a/cpp/src/qpid/broker/Queue.cpp b/cpp/src/qpid/broker/Queue.cpp index 5dd1adc12b..a421d16c72 100644 --- a/cpp/src/qpid/broker/Queue.cpp +++ b/cpp/src/qpid/broker/Queue.cpp @@ -182,6 +182,10 @@ void Queue::deliver(boost::intrusive_ptr& msg){ void Queue::recover(boost::intrusive_ptr& msg){ push(msg, true); + if (store){ + // setup synclist for recovered messages, so they don't get re-stored on lastNodeFailure + msg->addToSyncList(shared_from_this(), store); + } msg->enqueueComplete(); // mark the message as enqueued mgntEnqStats(msg); -- cgit v1.2.1