openstack
/
neutron
Code Issues Proposed changes

ovsdb: session.rpc never initialized 

Previously, if idl.Transaction.commit_block() returned a status of
TRY_AGAIN we would check self.api.idl._session.rpc.status which would
result in an attribute error as rpc is None.

This patch fixes this attribute error by removing this unneeded check. In
addtion, the force_reconnect() is also removed as ovs.jsonrpc handles
reconnecting automatically for us.

Change-Id: Ibf3ce5cd3432845f8938a1d83637ecf59b14b5ca
Closes-bug: 1465889
This commit is contained in:
Aaron Rosen 2015-06-16 17:23:09 -07:00
parent 2c166bb442
commit 95b6a74af1
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

@ -93,9 +93,6 @@ class Transaction(api.Transaction):
status = txn.commit_block()
if status == txn.TRY_AGAIN:
LOG.debug("OVSDB transaction returned TRY_AGAIN, retrying")
if self.api.idl._session.rpc.status != 0:
LOG.debug("Lost connection to OVSDB, reconnecting!")
self.api.idl.force_reconnect()
idlutils.wait_for_change(
self.api.idl, self.timeout - elapsed_time,
seqno)