openstack
/
ovsdbapp
Code Issues Proposed changes

Merge "Ensure idl.run() called on TRY_AGAIN"

This commit is contained in:
Zuul 2018-01-26 15:15:41 +00:00 committed by Gerrit Code Review
parent a2224d47ac 1810faecc9
commit 73542f7335
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ovsdbapp/backend/ovs_idl/transaction.py
View File

@ -91,6 +91,13 @@ class Transaction(api.Transaction):
status = txn.commit_block()
if status == txn.TRY_AGAIN:
LOG.debug("OVSDB transaction returned TRY_AGAIN, retrying")
# In the case that there is a reconnection after
# Connection.run() calls self.idl.run() but before do_commit()
# is called, commit_block() can loop w/o calling idl.run()
# which does the reconnect logic. It will then always return
# TRY_AGAIN until we time out and Connection.run() calls
# idl.run() again. So, call idl.run() here just in case.
self.api.idl.run()
continue
elif status == txn.ERROR:
msg = "OVSDB Error: %s" % txn.get_error()