x/vmware-nsx
Code Issues Proposed changes

Minor refactoring for add_router_to_l3_agent

Browse Source 
This method is more complicated than it needs
to be, and it makes it difficult to target
fixes for it.

Furthermore, this method calls into
auto_schedule_routers, which duplicates some
of the DB calls already made in the above
mentioned method. This refactoring
is done in preparation of the performance
improvement.

Partial-bug: #1356121
Related-Bug: #1358636

Change-Id: I9a0cfa41a5f067949b964d39157def55c40bf9af
This commit is contained in:
armando-migliaccio 2014-08-20 17:36:06 -07:00 committed by Eugene Nikanorov
parent afd098ec2b
commit 8e1fc581da
1 changed files with 70 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
neutron/db/l3_agentschedulers_db.py
View File

@ -122,28 +122,45 @@ class L3AgentSchedulerDbMixin(l3agentscheduler.L3AgentSchedulerPluginBase,
'dead_time': agent_dead_limit}) 'dead_time': agent_dead_limit})
self.reschedule_router(context, binding.router_id) self.reschedule_router(context, binding.router_id)
def add_router_to_l3_agent(self, context, agent_id, router_id): def validate_agent_router_combination(self, context, agent, router):
"""Add a l3 agent to host a router.""" """Validate if the router can be correctly assigned to the agent.
router = self.get_router(context, router_id)
distributed = router.get('distributed') :raises: RouterL3AgentMismatch if attempting to assign DVR router
with context.session.begin(subtransactions=True): to legacy agent, or centralized router to compute's L3 agents.
agent_db = self._get_agent(context, agent_id) :raises: InvalidL3Agent if attempting to assign router to an
agent_conf = self.get_configuration_dict(agent_db) unsuitable agent (disabled, type != L3, incompatible configuration)
"""
is_distributed = router.get('distributed')
agent_conf = self.get_configuration_dict(agent)
agent_mode = agent_conf.get('agent_mode', 'legacy') agent_mode = agent_conf.get('agent_mode', 'legacy')
if (not distributed and agent_mode == 'dvr' or
distributed and agent_mode == 'legacy'): is_agent_router_types_incompatible = (
router_type = ('distributed' if distributed else 'centralized') agent_mode == 'dvr' and not is_distributed
or agent_mode == 'legacy' and is_distributed
)
if is_agent_router_types_incompatible:
router_type = ('distributed' if is_distributed else 'centralized')
raise l3agentscheduler.RouterL3AgentMismatch( raise l3agentscheduler.RouterL3AgentMismatch(
router_type=router_type, router_id=router_id, router_type=router_type, router_id=router['id'],
agent_mode=agent_mode, agent_id=agent_id) agent_mode=agent_mode, agent_id=agent['id'])
if (agent_db['agent_type'] != constants.AGENT_TYPE_L3 or
not agent_db['admin_state_up'] or is_wrong_type_or_unsuitable_agent = (
not self.get_l3_agent_candidates(context, agent['agent_type'] != constants.AGENT_TYPE_L3 or
router, not agent['admin_state_up'] or
[agent_db])): not self.get_l3_agent_candidates(context, router, [agent])
raise l3agentscheduler.InvalidL3Agent(id=agent_id) )
if is_wrong_type_or_unsuitable_agent:
raise l3agentscheduler.InvalidL3Agent(id=agent['id'])
def validate_agent_router_existing_binding(self, context, agent, router):
"""Validate if the router is already assigned to the agent.
:raises: RouterHostedByL3Agent if router is already assigned
"""
router_id = router['id']
agent_id = agent['id']
query = context.session.query(RouterL3AgentBinding) query = context.session.query(RouterL3AgentBinding)
if distributed: if router.get('distributed'):
binding = query.filter_by(router_id=router_id, binding = query.filter_by(router_id=router_id,
l3_agent_id=agent_id).first() l3_agent_id=agent_id).first()
if binding: if binding:
@ -160,17 +177,28 @@ class L3AgentSchedulerDbMixin(l3agentscheduler.L3AgentSchedulerPluginBase,
except exc.NoResultFound: except exc.NoResultFound:
pass pass
result = self.auto_schedule_routers(context, def create_router_to_agent_binding(self, context, agent, router):
agent_db.host, """Create router to agent binding."""
[router_id]) router_id = router['id']
agent_id = agent['id']
result = self.auto_schedule_routers(context, agent.host, [router_id])
if not result: if not result:
raise l3agentscheduler.RouterSchedulingFailed( raise l3agentscheduler.RouterSchedulingFailed(
router_id=router_id, agent_id=agent_id) router_id=router_id, agent_id=agent_id)
def add_router_to_l3_agent(self, context, agent_id, router_id):
"""Add a l3 agent to host a router."""
with context.session.begin(subtransactions=True):
router = self.get_router(context, router_id)
agent = self._get_agent(context, agent_id)
self.validate_agent_router_combination(context, agent, router)
self.validate_agent_router_existing_binding(context, agent, router)
self.create_router_to_agent_binding(context, agent, router)
l3_notifier = self.agent_notifiers.get(constants.AGENT_TYPE_L3) l3_notifier = self.agent_notifiers.get(constants.AGENT_TYPE_L3)
if l3_notifier: if l3_notifier:
l3_notifier.router_added_to_agent( l3_notifier.router_added_to_agent(
context, [router_id], agent_db.host) context, [router_id], agent.host)
def remove_router_from_l3_agent(self, context, agent_id, router_id): def remove_router_from_l3_agent(self, context, agent_id, router_id):
"""Remove the router from l3 agent. """Remove the router from l3 agent.