Ensure that the report state is not a blocking call

Fixes bug 1191768

For the dhcp and l3 agents the first state report will be done
via a call. If this succeeds then subsequent calls will be done via
the cast method.

Change-Id: I82a1d92fc84983b7bb46758db0aee3e3eca1d3be

diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py
index 2c51861e7c2d827d4d129fb7100218ddaa5eb1bf..76e500c70b9535194ee9cbf0b8d16e47e3f71c2c 100644 (file)
--- a/quantum/agent/dhcp_agent.py
+++ b/quantum/agent/dhcp_agent.py
@@ -743,6 +743,7 @@ class DhcpAgentWithStateReport(DhcpAgent):
             'start_flag': True,
             'agent_type': constants.AGENT_TYPE_DHCP}
         report_interval = cfg.CONF.AGENT.report_interval
+        self.use_call = True
         if report_interval:
             self.heartbeat = loopingcall.FixedIntervalLoopingCall(
                 self._report_state)
@@ -753,8 +754,8 @@ class DhcpAgentWithStateReport(DhcpAgent):
             self.agent_state.get('configurations').update(
                 self.cache.get_state())
             ctx = context.get_admin_context_without_session()
-            self.state_rpc.report_state(ctx,
-                                        self.agent_state)
+            self.state_rpc.report_state(ctx, self.agent_state, self.use_call)
+            self.use_call = False
         except AttributeError:
             # This means the server does not support report_state
             LOG.warn(_("Quantum server does not support state report."

diff --git a/quantum/agent/l3_agent.py b/quantum/agent/l3_agent.py
index 1cccb78a8f4014a02d165c6f8aaaaf17f9f3fc71..1c40e7d09c9fb1238ad9266cb6a2ebed4a968a42 100644 (file)
--- a/quantum/agent/l3_agent.py
+++ b/quantum/agent/l3_agent.py
@@ -721,6 +721,7 @@ class L3NATAgentWithStateReport(L3NATAgent):
             'start_flag': True,
             'agent_type': l3_constants.AGENT_TYPE_L3}
         report_interval = cfg.CONF.AGENT.report_interval
+        self.use_call = True
         if report_interval:
             self.heartbeat = loopingcall.FixedIntervalLoopingCall(
                 self._report_state)
@@ -746,9 +747,10 @@ class L3NATAgentWithStateReport(L3NATAgent):
         configurations['interfaces'] = num_interfaces
         configurations['floating_ips'] = num_floating_ips
         try:
-            self.state_rpc.report_state(self.context,
-                                        self.agent_state)
+            self.state_rpc.report_state(self.context, self.agent_state,
+                                        self.use_call)
             self.agent_state.pop('start_flag', None)
+            self.use_call = False
         except AttributeError:
             # This means the server does not support report_state
             LOG.warn(_("Quantum server does not support state report."

diff --git a/quantum/agent/rpc.py b/quantum/agent/rpc.py
index 960bcde621bde6ebaf55c78e2d6bfcd687c1bbdf..adc596facfe05e194b670fb58748056d5ccad735 100644 (file)
--- a/quantum/agent/rpc.py
+++ b/quantum/agent/rpc.py
@@ -52,13 +52,15 @@ class PluginReportStateAPI(proxy.RpcProxy):
         super(PluginReportStateAPI, self).__init__(
             topic=topic, default_version=self.BASE_RPC_API_VERSION)
 
-    def report_state(self, context, agent_state):
-        return self.call(context,
-                         self.make_msg('report_state',
-                                       agent_state={'agent_state':
-                                                    agent_state},
-                                       time=timeutils.strtime()),
-                         topic=self.topic)
+    def report_state(self, context, agent_state, use_call=False):
+        msg = self.make_msg('report_state',
+                            agent_state={'agent_state':
+                                         agent_state},
+                            time=timeutils.strtime())
+        if use_call:
+            return self.call(context, msg, topic=self.topic)
+        else:
+            return self.cast(context, msg, topic=self.topic)
 
 
 class PluginApi(proxy.RpcProxy):

diff --git a/quantum/tests/unit/test_agent_rpc.py b/quantum/tests/unit/test_agent_rpc.py
index fb2924fee5855aa44c909f04b4cf4904a39de6e4..4b9c5d6531fe6f67f28fa2219c16fcb0efe13eb5 100644 (file)
--- a/quantum/tests/unit/test_agent_rpc.py
+++ b/quantum/tests/unit/test_agent_rpc.py
@@ -47,13 +47,14 @@ class AgentRPCPluginApi(base.BaseTestCase):
 
 
 class AgentPluginReportState(base.BaseTestCase):
-    def test_plugin_report_state(self):
+    def test_plugin_report_state_use_call(self):
         topic = 'test'
         reportStateAPI = rpc.PluginReportStateAPI(topic)
         expected_agent_state = {'agent': 'test'}
         with mock.patch.object(reportStateAPI, 'call') as call:
             ctxt = context.RequestContext('fake_user', 'fake_project')
-            reportStateAPI.report_state(ctxt, expected_agent_state)
+            reportStateAPI.report_state(ctxt, expected_agent_state,
+                                        use_call=True)
             self.assertEqual(call.call_args[0][0], ctxt)
             self.assertEqual(call.call_args[0][1]['method'],
                              'report_state')
@@ -63,6 +64,22 @@ class AgentPluginReportState(base.BaseTestCase):
                                   str)
             self.assertEqual(call.call_args[1]['topic'], topic)
 
+    def test_plugin_report_state_cast(self):
+        topic = 'test'
+        reportStateAPI = rpc.PluginReportStateAPI(topic)
+        expected_agent_state = {'agent': 'test'}
+        with mock.patch.object(reportStateAPI, 'cast') as cast:
+            ctxt = context.RequestContext('fake_user', 'fake_project')
+            reportStateAPI.report_state(ctxt, expected_agent_state)
+            self.assertEqual(cast.call_args[0][0], ctxt)
+            self.assertEqual(cast.call_args[0][1]['method'],
+                             'report_state')
+            self.assertEqual(cast.call_args[0][1]['args']['agent_state'],
+                             {'agent_state': expected_agent_state})
+            self.assertIsInstance(cast.call_args[0][1]['args']['time'],
+                                  str)
+            self.assertEqual(cast.call_args[1]['topic'], topic)
+
 
 class AgentRPCMethods(base.BaseTestCase):
     def test_create_consumers(self):

diff --git a/quantum/tests/unit/test_dhcp_agent.py b/quantum/tests/unit/test_dhcp_agent.py
index 4f0f63951e82845b94e9fe6b700d46c7bf772228..cc23a6d45265a8e02077ac0d2000ff3c59aeece8 100644 (file)
--- a/quantum/tests/unit/test_dhcp_agent.py
+++ b/quantum/tests/unit/test_dhcp_agent.py
@@ -161,7 +161,8 @@ class TestDhcpAgent(base.BaseTestCase):
                                 agent_mgr)
                             state_rpc.assert_has_calls(
                                 [mock.call(mock.ANY),
-                                 mock.call().report_state(mock.ANY, mock.ANY)])
+                                 mock.call().report_state(mock.ANY, mock.ANY,
+                                                          mock.ANY)])
                             mock_lease_relay.assert_has_calls(
                                 [mock.call(mock.ANY),
                                  mock.call().start()])