-From 975c75e089327bd63f9fa5c934950244f0daae42 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@redhat.com>
-Date: Fri, 21 Jun 2013 10:47:51 +0100
-Subject: [PATCH] avoid code path causing qpid exchange leaks
-
-Always assume amqp_rpc_single_reply_queue is True,
-so that the problematic code path is ignored.
-The issue is discussed at https://pad.lv/1178375
----
- ceilometer/openstack/common/rpc/amqp.py | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/ceilometer/openstack/common/rpc/amqp.py b/ceilometer/openstack/common/rpc/amqp.py
-index d8e6ba0..01f0e1f 100644
---- a/ceilometer/openstack/common/rpc/amqp.py
-+++ b/ceilometer/openstack/common/rpc/amqp.py
-@@ -590,7 +590,8 @@ def multicall(conf, context, topic, msg, timeout, connection_pool):
-
- # TODO(pekowski): Remove this flag and the code under the if clause
- # in Havana.
-- if not conf.amqp_rpc_single_reply_queue:
-+ # (p-draigbrady): This clause is disabled to avoid qpid exchange leaks
-+ if False and not conf.amqp_rpc_single_reply_queue:
- conn = ConnectionContext(conf, connection_pool)
- wait_msg = MulticallWaiter(conf, conn, timeout)
- conn.declare_direct_consumer(msg_id, wait_msg)