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