Merge lp:~xianghui/ubuntu/trusty/neutron/lp1393391 into lp:ubuntu/trusty-proposed/neutron

[Xiang Hui]

  * neutron-openvswitch-agent stuck on 'q-agent-notifier-port-update_fanout-x'
    is NOT_FOUND exception, this bug caused RabbitMQ HA(active + active) failover
    in Icehouse not work with large scaled nova compute nodes. (LP: #1393391):
    - d/p/fix-neutron-agent-fanout-queue-not-found-loop.patch

[Serge Hallyn (serge-hallyn)]

Hi,

Could you please add DEP3 (http://dep.debian.net/deps/dep3/) headers to the patch?

[lp:~xianghui/ubuntu/trusty/neutron/lp1393391]

37. By Xiang Hui on 2016-02-11

Add dep3

[Xiang Hui (xianghui)]

@Serge,

Thanks for looking at it, added the dep3 header.

=== added file '.pc/disable-udev-tests.patch/.timestamp'
=== added file '.pc/fix-quantum-configuration.patch/.timestamp'
=== added file '.pc/skip-ipv6-tests.patch/.timestamp'
=== added file '.pc/use-concurrency.patch/.timestamp'
=== modified file 'debian/changelog'
--- debian/changelog	2015-06-22 10:14:52 +0000
+++ debian/changelog	2016-02-11 08:35:25 +0000
@@ -1,3 +1,12 @@
+neutron (1:2014.1.5-0ubuntu2) trusty; urgency=medium
+
+  * neutron-openvswitch-agent stuck on 'q-agent-notifier-port-update_fanout-x'
+    is NOT_FOUND exception, this bug caused RabbitMQ HA(active + active) failover
+    in Icehouse not work with large scaled nova compute nodes. (LP: #1393391):
+    - d/p/fix-neutron-agent-fanout-queue-not-found-loop.patch 
+
+ -- Hui Xiang <[e-mail]>  Mon, 25 Jan 2016 15:25:13 +0800
+
 neutron (1:2014.1.5-0ubuntu1) trusty; urgency=medium
 
   * Resynchronize with stable/icehouse (877df58) (LP: #1467533):
 
=== added file 'debian/patches/fix-neutron-agent-fanout-queue-not-found-loop.patch'
--- debian/patches/fix-neutron-agent-fanout-queue-not-found-loop.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-neutron-agent-fanout-queue-not-found-loop.patch	2016-02-11 08:35:25 +0000
@@ -0,0 +1,32 @@
+--- debian/patches/fix-neutron-agent-fanout-queue-not-found-loop.patch	2016-01-25 15:24:39.000000000 +0800
++++ debian/patches/fix-neutron-agent-fanout-queue-not-found-loop.patch	1970-01-01 08:00:00.000000000 +0800
+@@ -1,29 +0,0 @@
+-Description: Fix-neutron-agent-fanout-queue-not-found-loop
+-
+-  neutron-openvswitch-agent stuck on 'q-agent-notifier-port-update_fanout-x'
+-  is NOT_FOUND exception, this bug caused RabbitMQ HA(active + active) failover
+-  in Icehouse not work with large scaled nova compute nodes.
+-
+-Author: [e-mail]
+-Origin: other
+-Bug: https://bugs.launchpad.net/neutron/+bug/1393391
+----
+-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---- a/neutron/openstack/common/rpc/impl_kombu.py
+-+++ b/neutron/openstack/common/rpc/impl_kombu.py
+-@@ -792,6 +792,15 @@
+-                 self.consume()
+-             except greenlet.GreenletExit:
+-                 return
+-+            except Exception as e:
+-+                if e.code == 404:
+-+                    # Redeclare queue if it is deleted due to HA cluster
+-+                    # disconnection, LP#1393391
+-+                    LOG.warn(_("Queue NOT FOUND : %s"), e)
+-+                    self.channel = self.connection.channel()
+-+                    for consumer in self.consumers:
+-+                        consumer.reconnect(self.channel)
+-+
+-         if self.consumer_thread is None:
+-             self.consumer_thread = eventlet.spawn(_consumer_thread)
+-         return self.consumer_thread
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-08-08 08:30:52 +0000
+++ debian/patches/series	2016-02-11 08:35:25 +0000
@@ -2,3 +2,4 @@
 disable-udev-tests.patch
 skip-ipv6-tests.patch
 use-concurrency.patch
+fix-neutron-agent-fanout-queue-not-found-loop.patch