x/vmware-nsx
Code Issues Proposed changes

Increase ovsdb_monitor.SimpleInterfaceMonitor start timeout

Browse Source 
The current timeout fails during functional testing with
slightly higher load. Increasing it will lower the timeout
chances during high load conditions. Changed from 5 seconds
to respawn_interval/2. DEFAULT_OVSDBMON_RESPAWN = 30 , so
the default timeout will be 15 seconds.

Change-Id: I6a9e2977b275e96dcf01c4df90a33169c42287d6
Closes-Bug: #1358206
This commit is contained in:
Miguel Angel Ajo 2014-08-18 12:32:26 +02:00
parent 7953988b9a
commit f99b591157
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/agent/linux/ovsdb_monitor.py
View File

@ -69,6 +69,10 @@ class SimpleInterfaceMonitor(OvsdbMonitor):
respawn_interval=respawn_interval, respawn_interval=respawn_interval,
) )
self.data_received = False self.data_received = False
if respawn_interval:
self._default_timeout = respawn_interval / 2
else:
self._default_timeout = 10
@property @property
def is_active(self): def is_active(self):
@ -87,7 +91,8 @@ class SimpleInterfaceMonitor(OvsdbMonitor):
""" """
return bool(list(self.iter_stdout())) or not self.is_active return bool(list(self.iter_stdout())) or not self.is_active
def start(self, block=False, timeout=5): def start(self, block=False, timeout=None):
timeout = timeout or self._default_timeout
super(SimpleInterfaceMonitor, self).start() super(SimpleInterfaceMonitor, self).start()
if block: if block:
eventlet.timeout.Timeout(timeout) eventlet.timeout.Timeout(timeout)