openstack
/
neutron
Code Issues Proposed changes

Merge "Switch to new engine facade in neutron/db/agents_db.py"

changes/87/609587/4
Zuul 2018-11-11 17:03:48 +00:00 committed by Gerrit Code Review
parent 348509b3ca 4ba87b06d7
commit 14c940333c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/db/agents_db.py
View File

@ -273,7 +273,7 @@ class AgentDbMixin(ext_agent.AgentPluginBase, AgentAvailabilityZoneMixin):
@db_api.retry_if_session_inactive()
def update_agent(self, context, id, agent):
agent_data = agent['agent']
with context.session.begin(subtransactions=True):
with db_api.CONTEXT_WRITER.using(context):
agent = self._get_agent(context, id)
agent.update_fields(agent_data)
agent.update()
@ -374,7 +374,7 @@ class AgentDbMixin(ext_agent.AgentPluginBase, AgentAvailabilityZoneMixin):
It could be used by agent to do some sync with the server if needed.
"""
status = agent_consts.AGENT_ALIVE
with context.session.begin(subtransactions=True):
with db_api.CONTEXT_WRITER.using(context):
res_keys = ['agent_type', 'binary', 'host', 'topic']
res = dict((k, agent_state[k]) for k in res_keys)
if 'availability_zone' in agent_state: