openstack
/
neutron
Code Issues Proposed changes

Merge "Don't wait on TRY_AGAIN when calling commit_block()" into stable/ocata

This commit is contained in:
Zuul 2017-11-16 03:25:25 +00:00 committed by Gerrit Code Review
parent 023ec447e9 319ac92d9b
commit 609ef51148
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/agent/ovsdb/impl_idl.py
View File

@ -105,12 +105,9 @@ class Transaction(api.Transaction):
txn.abort()
if not self.check_error:
ctx.reraise = False
seqno = self.api.idl.change_seqno
status = txn.commit_block()
if status == txn.TRY_AGAIN:
LOG.debug("OVSDB transaction returned TRY_AGAIN, retrying")
idlutils.wait_for_change(self.api.idl, self.time_remaining(),
seqno)
continue
elif status == txn.ERROR:
msg = _("OVSDB Error: %s") % txn.get_error()