Merge "Fix leaked file descriptors by cleaning up objects" into stable/ussuri
This commit is contained in:
commit
e87a553689
|
@ -186,10 +186,11 @@ class OvnNbIdlForLb(ovsdb_monitor.OvnIdl):
|
|||
|
||||
def stop(self):
|
||||
# Close the running connection if it has been initalized
|
||||
if ((hasattr(self, 'conn') and not
|
||||
self.conn.stop(timeout=ovn_conf.get_ovn_ovsdb_timeout()))):
|
||||
LOG.debug("Connection terminated to OvnNb "
|
||||
"but a thread is still alive")
|
||||
if hasattr(self, 'conn'):
|
||||
if not self.conn.stop(timeout=ovn_conf.get_ovn_ovsdb_timeout()):
|
||||
LOG.debug("Connection terminated to OvnNb "
|
||||
"but a thread is still alive")
|
||||
del self.conn
|
||||
# complete the shutdown for the event handler
|
||||
self.notify_handler.shutdown()
|
||||
# Close the idl session
|
||||
|
@ -266,6 +267,7 @@ class OvnProviderHelper(object):
|
|||
self.requests.put({'type': REQ_TYPE_EXIT})
|
||||
self.helper_thread.join()
|
||||
self.ovn_nbdb.stop()
|
||||
del self.ovn_nbdb_api
|
||||
|
||||
@staticmethod
|
||||
def _map_val(row, col, key):
|
||||
|
|
Loading…
Reference in New Issue