[openstack-cinder/el6-grizzly] avoid qpid exchange leaks

[Pádraig Brady]

commit ad3f09a9dbf5d1af321a205120a2cccc41b741db
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Jul 17 16:16:17 2013 +0100

    avoid qpid exchange leaks

 ...e-don-t-access-the-net-when-building-docs.patch |    4 +-
 ...-parallel-install-versions-of-epel-packag.patch |    6 ++--
 ...ecated-assert_unicode-sqlalchemy-attribut.patch |    4 +-
 ...oid-code-path-causing-qpid-exchange-leaks.patch |   26 ++++++++++++++++++++
 openstack-cinder.spec                              |    7 ++++-
 5 files changed, 39 insertions(+), 8 deletions(-)
---
diff --git a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
index 6860799..ee681ac 100644
--- a/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -5,8 +5,8 @@ Subject: [PATCH] Ensure we don't access the net when building docs
 
 (Note, this has not been sent upstream)
 ---
- doc/source/conf.py | 1 -
- 1 file changed, 1 deletion(-)
+ doc/source/conf.py |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
 index 40e564b..01bd3b4 100644
diff --git a/0002-Use-updated-parallel-install-versions-of-epel-packag.patch b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
index c48aaf8..d77a944 100644
--- a/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
+++ b/0002-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -15,9 +15,9 @@ system default module versions.
 Conflicts:
 	bin/cinder-manage
 ---
- bin/cinder-manage                 |  7 ++++---
- cinder/__init__.py                | 30 ++++++++++++++++++++++++++++++
- cinder/db/sqlalchemy/migration.py |  7 ++++++-
+ bin/cinder-manage                 |    7 ++++---
+ cinder/__init__.py                |   30 ++++++++++++++++++++++++++++++
+ cinder/db/sqlalchemy/migration.py |    7 ++++++-
  3 files changed, 40 insertions(+), 4 deletions(-)
 
 diff --git a/bin/cinder-manage b/bin/cinder-manage
diff --git a/0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch b/0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
index 8400dd7..1d90078 100644
--- a/0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
+++ b/0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
@@ -9,8 +9,8 @@ http://docs.sqlalchemy.org/en/latest/changelog/changelog_08.html#change-ad44af79
 
 Change-Id: I305bfdbcd3c3669c41318ea34115624f729b3909
 ---
- cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py | 11 ++++-------
- cinder/db/sqlalchemy/migrate_repo/versions/008_add_backup.py  | 11 -----------
+ .../migrate_repo/versions/002_quota_class.py       |   11 ++++-------
+ .../migrate_repo/versions/008_add_backup.py        |   11 -----------
  2 files changed, 4 insertions(+), 18 deletions(-)
 
 diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py b/cinder/db/sqlalchemy/migrate_repo/versions/002_quota_class.py
diff --git a/0004-avoid-code-path-causing-qpid-exchange-leaks.patch b/0004-avoid-code-path-causing-qpid-exchange-leaks.patch
new file mode 100644
index 0000000..d219d77
--- /dev/null
+++ b/0004-avoid-code-path-causing-qpid-exchange-leaks.patch
@@ -0,0 +1,26 @@
+From 9e65a17f9143616548c722231d0f4399c142bcd5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
+Date: Wed, 17 Jul 2013 16:03:44 +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
+---
+ cinder/openstack/common/rpc/amqp.py |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/cinder/openstack/common/rpc/amqp.py b/cinder/openstack/common/rpc/amqp.py
+index 832511c..fd621c4 100644
+--- a/cinder/openstack/common/rpc/amqp.py
++++ b/cinder/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)
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index 18acd7e..acaacf3 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-cinder
 Version:          2013.1.2
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          OpenStack Volume service
 
 Group:            Applications/System
@@ -28,6 +28,7 @@ Source20:         cinder-sudoers
 Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
 Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
 Patch0003: 0003-remove-deprecated-assert_unicode-sqlalchemy-attribut.patch
+Patch0004: 0004-avoid-code-path-causing-qpid-exchange-leaks.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -128,6 +129,7 @@ This package contains documentation files for cinder.
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -282,6 +284,9 @@ fi
 %endif
 
 %changelog
+* Wed Jul 17 2013 Pádraig Brady <pbrady at redhat.com> - 2013.1.2-2
+- Avoid qpid exchange leaks
+
 * Mon Jun 20 2013 Eric Harney <eharney at redhat.com> - 2013.1.2-1
 - Update to Grizzly stable release 2