diff options
| author | Alan Conway <aconway@apache.org> | 2012-10-02 18:41:41 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-10-02 18:41:41 +0000 |
| commit | b45b6daf6121e3f069de938439e1e37ff0cf7cc1 (patch) | |
| tree | 90e8934452fa96d1b473dc73fdfca36f0d155490 /qpid/cpp/src/qpid/broker/Queue.h | |
| parent | 91dfa1fd49a50a3dae9d12ae5f6b08c711428683 (diff) | |
| download | qpid-python-b45b6daf6121e3f069de938439e1e37ff0cf7cc1.tar.gz | |
QPID-4285: HA backups continuously disconnect / re-sync after attempting to replicate a deleted queue. (Based on patch by Jason Dillama)
This does not directly tackle the origin of the problem but extends Jasons's patch since
it addresses something we had to fix anyway: "leaking" queues and exchanges. It does 2 things.
1. enabled hideDeletedError on all subscription objects used by HA
This suppress the troublesome exception with a harmless no-op
2. Delete queues/exchanges missing from responses (based on Jasons patch)
Fix the "leak" of queues and exchanges possible when an object replicated
to a backup is deleted from the newn primary before the backup connects.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1393089 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/broker/Queue.h')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Queue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h index d52afec6b9..b628f17c08 100644 --- a/qpid/cpp/src/qpid/broker/Queue.h +++ b/qpid/cpp/src/qpid/broker/Queue.h @@ -188,7 +188,7 @@ class Queue : public boost::enable_shared_from_this<Queue>, int getEventMode(); void dequeueFromStore(boost::intrusive_ptr<PersistableMessage>); void abandoned(const Message& message); - void checkNotDeleted(const Consumer::shared_ptr&); + bool checkNotDeleted(const Consumer::shared_ptr&); void notifyDeleted(); uint32_t remove(uint32_t maxCount, MessagePredicate, MessageFunctor, SubscriptionType); virtual bool checkDepth(const QueueDepth& increment, const Message&); |