openstack/neutron-fwaas
Code Issues Proposed changes

Fix issues with db pooling

Browse Source 
Fixes bug 1157045

Change-Id: I1b0ea5b18b3d75dc3d047975b234275420af189c
This commit is contained in:
Gary Kotton 2013-03-21 17:01:31 +00:00
parent 28c8728a67
commit 1ee37e03a6
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
quantum/agent/rpc.py
View File

@ -24,6 +24,7 @@ from quantum.openstack.common.notifier import api
from quantum.openstack.common.notifier import rpc_notifier from quantum.openstack.common.notifier import rpc_notifier
from quantum.openstack.common import rpc from quantum.openstack.common import rpc
from quantum.openstack.common.rpc import proxy from quantum.openstack.common.rpc import proxy
from quantum.openstack.common import timeutils
from quantum.openstack.common import uuidutils from quantum.openstack.common import uuidutils
@ -60,7 +61,8 @@ class PluginReportStateAPI(proxy.RpcProxy):
return self.call(context, return self.call(context,
self.make_msg('report_state', self.make_msg('report_state',
agent_state={'agent_state': agent_state={'agent_state':
agent_state}), agent_state},
time=timeutils.utcnow()),
topic=self.topic) topic=self.topic)

6
quantum/db/agents_db.py
View File

@ -159,9 +159,15 @@ class AgentDbMixin(ext_agent.AgentPluginBase):
class AgentExtRpcCallback(object): class AgentExtRpcCallback(object):
"""Processes the rpc report in plugin implementations.""" """Processes the rpc report in plugin implementations."""
RPC_API_VERSION = '1.0' RPC_API_VERSION = '1.0'
START_TIME = timeutils.utcnow()
def report_state(self, context, **kwargs): def report_state(self, context, **kwargs):
"""Report state from agent to server. """ """Report state from agent to server. """
time = kwargs['time']
time = timeutils.parse_strtime(time)
if self.START_TIME > time:
LOG.debug(_("Message with invalid timestamp received"))
return
agent_state = kwargs['agent_state']['agent_state'] agent_state = kwargs['agent_state']['agent_state']
plugin = manager.QuantumManager.get_plugin() plugin = manager.QuantumManager.get_plugin()
plugin.create_or_update_agent(context, agent_state) plugin.create_or_update_agent(context, agent_state)

4
quantum/tests/unit/openvswitch/test_agent_scheduler.py
View File

@ -28,6 +28,7 @@ from quantum.db import dhcp_rpc_base
from quantum.db import l3_rpc_base from quantum.db import l3_rpc_base
from quantum.extensions import agentscheduler from quantum.extensions import agentscheduler
from quantum import manager from quantum import manager
from quantum.openstack.common import timeutils
from quantum.openstack.common import uuidutils from quantum.openstack.common import uuidutils
from quantum.tests.unit import test_agent_ext_plugin from quantum.tests.unit import test_agent_ext_plugin
from quantum.tests.unit.testlib_api import create_request from quantum.tests.unit.testlib_api import create_request
@ -167,7 +168,8 @@ class AgentSchedulerTestMixIn(object):
def _register_one_agent_state(self, agent_state): def _register_one_agent_state(self, agent_state):
callback = agents_db.AgentExtRpcCallback() callback = agents_db.AgentExtRpcCallback()
callback.report_state(self.adminContext, callback.report_state(self.adminContext,
agent_state={'agent_state': agent_state}) agent_state={'agent_state': agent_state},
time=timeutils.strtime())
def _disable_agent(self, agent_id, admin_state_up=False): def _disable_agent(self, agent_id, admin_state_up=False):
new_agent = {} new_agent = {}

13
quantum/tests/unit/test_agent_ext_plugin.py
View File

@ -29,6 +29,7 @@ from quantum.db import agents_db
from quantum.db import db_base_plugin_v2 from quantum.db import db_base_plugin_v2
from quantum.extensions import agent from quantum.extensions import agent
from quantum.openstack.common import log as logging from quantum.openstack.common import log as logging
from quantum.openstack.common import timeutils
from quantum.openstack.common import uuidutils from quantum.openstack.common import uuidutils
from quantum.tests.unit import test_api_v2 from quantum.tests.unit import test_api_v2
from quantum.tests.unit import test_db_plugin from quantum.tests.unit import test_db_plugin
@ -103,13 +104,17 @@ class AgentDBTestMixIn(object):
dhcp_hostc['host'] = DHCP_HOSTC dhcp_hostc['host'] = DHCP_HOSTC
callback = agents_db.AgentExtRpcCallback() callback = agents_db.AgentExtRpcCallback()
callback.report_state(self.adminContext, callback.report_state(self.adminContext,
agent_state={'agent_state': l3_hosta}) agent_state={'agent_state': l3_hosta},
time=timeutils.strtime())
callback.report_state(self.adminContext, callback.report_state(self.adminContext,
agent_state={'agent_state': l3_hostb}) agent_state={'agent_state': l3_hostb},
time=timeutils.strtime())
callback.report_state(self.adminContext, callback.report_state(self.adminContext,
agent_state={'agent_state': dhcp_hosta}) agent_state={'agent_state': dhcp_hosta},
time=timeutils.strtime())
callback.report_state(self.adminContext, callback.report_state(self.adminContext,
agent_state={'agent_state': dhcp_hostc}) agent_state={'agent_state': dhcp_hostc},
time=timeutils.strtime())
return [l3_hosta, l3_hostb, dhcp_hosta, dhcp_hostc] return [l3_hosta, l3_hostb, dhcp_hosta, dhcp_hostc]