From 4a1a37ce9f8baf2078a1a44380895d144203a876 Mon Sep 17 00:00:00 2001
From: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date: Tue, 5 Mar 2013 09:52:01 +0800
Subject: [PATCH] Fixes linuxbridge agent downs with tap device deletion timing
 issue

Fixes bug 1136264

Add try/except in deamon loop for preventing agent broken down by
unhandled exception.

Change-Id: I99a4f2b485f134b240630a895378d0f61d6382d8
---
 .../agent/linuxbridge_quantum_agent.py        | 28 +++++----
 .../unit/linuxbridge/test_lb_quantum_agent.py | 58 +++++++++++++++++++
 2 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
index ea28ee2c8..27e3e14bf 100755
--- a/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
+++ b/quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py
@@ -601,16 +601,24 @@ class LinuxBridgeQuantumAgentRPC(sg_rpc.SecurityGroupAgentRpcMixin):
                 LOG.info(_("Agent out of sync with plugin!"))
                 devices.clear()
                 sync = False
-
-            device_info = self.br_mgr.update_devices(devices)
-
-            # notify plugin about device deltas
-            if device_info:
-                LOG.debug(_("Agent loop has new devices!"))
-                # If treat devices fails - indicates must resync with plugin
-                sync = self.process_network_devices(device_info)
-                devices = device_info['current']
-
+            device_info = {}
+            try:
+                device_info = self.br_mgr.update_devices(devices)
+            except Exception:
+                LOG.exception(_("Update devices failed"))
+                sync = True
+            try:
+                # notify plugin about device deltas
+                if device_info:
+                    LOG.debug(_("Agent loop has new devices!"))
+                    # If treat devices fails - indicates must resync with
+                    # plugin
+                    sync = self.process_network_devices(device_info)
+                    devices = device_info['current']
+            except Exception:
+                LOG.exception(_("Error in agent loop. Devices info: %s"),
+                              device_info)
+                sync = True
             # sleep till end of polling interval
             elapsed = (time.time() - start)
             if (elapsed < self.polling_interval):
diff --git a/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
index a03a29adf..da2900227 100644
--- a/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
+++ b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py
@@ -14,6 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import contextlib
+
 import mock
 from oslo.config import cfg
 import testtools
@@ -52,3 +54,59 @@ class TestLinuxBridge(testtools.TestCase):
             result = self.linux_bridge.ensure_physical_in_bridge(
                 'network_id', 'physnet1', 7)
         self.assertTrue(vlan_bridge_func.called)
+
+
+class TestLinuxBridgeAgent(testtools.TestCase):
+
+    def setUp(self):
+        super(TestLinuxBridgeAgent, self).setUp()
+        self.lbmgr_patcher = mock.patch('quantum.plugins.linuxbridge.agent.'
+                                        'linuxbridge_quantum_agent.'
+                                        'LinuxBridgeManager')
+        self.lbmgr_mock = self.lbmgr_patcher.start()
+        self.addCleanup(self.lbmgr_patcher.stop)
+
+    def test_update_devices_failed(self):
+        lbmgr_instance = self.lbmgr_mock.return_value
+        lbmgr_instance.update_devices.side_effect = RuntimeError
+        agent = linuxbridge_quantum_agent.LinuxBridgeQuantumAgentRPC({},
+                                                                     0,
+                                                                     None)
+        raise_exception = [0]
+
+        def info_mock(msg):
+            if raise_exception[0] < 2:
+                raise_exception[0] += 1
+            else:
+                raise RuntimeError()
+
+        with mock.patch.object(linuxbridge_quantum_agent.LOG, 'info') as log:
+            log.side_effect = info_mock
+            with testtools.ExpectedException(RuntimeError):
+                agent.daemon_loop()
+            self.assertEqual(3, log.call_count)
+
+    def test_process_network_devices_failed(self):
+        device_info = {'current': [1, 2, 3]}
+        lbmgr_instance = self.lbmgr_mock.return_value
+        lbmgr_instance.update_devices.return_value = device_info
+        agent = linuxbridge_quantum_agent.LinuxBridgeQuantumAgentRPC({},
+                                                                     0,
+                                                                     None)
+        raise_exception = [0]
+
+        def info_mock(msg):
+            if raise_exception[0] < 2:
+                raise_exception[0] += 1
+            else:
+                raise RuntimeError()
+
+        with contextlib.nested(
+            mock.patch.object(linuxbridge_quantum_agent.LOG, 'info'),
+            mock.patch.object(agent, 'process_network_devices')
+        ) as (log, process_network_devices):
+            log.side_effect = info_mock
+            process_network_devices.side_effect = RuntimeError
+            with testtools.ExpectedException(RuntimeError):
+                agent.daemon_loop()
+            self.assertEqual(3, log.call_count)
-- 
2.45.2