openstack
/
neutron
Code Issues Proposed changes

Merge "Retry updating agents table in case of deadlock"

This commit is contained in:
Jenkins 2016-03-31 00:14:59 +00:00 committed by Gerrit Code Review
parent 768f4e8047 d5e4013556
commit 1edb841eba
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/db/agents_db.py
View File

@ -33,6 +33,7 @@ from neutron.api.rpc.callbacks import version_manager
from neutron.api.v2 import attributes
from neutron.common import constants
from neutron import context
from neutron.db import api as db_api
from neutron.db import model_base
from neutron.extensions import agent as ext_agent
from neutron.extensions import availability_zone as az_ext
@ -446,6 +447,7 @@ class AgentExtRpcCallback(object):
# Initialize RPC api directed to other neutron-servers
self.server_versions_rpc = resources_rpc.ResourcesPushToServersRpcApi()
@db_api.retry_db_errors
def report_state(self, context, **kwargs):
"""Report state from agent to server.