From 44eff5daad81966f6530d84ca3683b2f9c58debf Mon Sep 17 00:00:00 2001 From: Miguel Angel Ajo Date: Mon, 18 Aug 2014 12:32:26 +0200 Subject: [PATCH] Increase ovsdb_monitor.SimpleInterfaceMonitor start timeout 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 --- neutron/agent/linux/ovsdb_monitor.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/neutron/agent/linux/ovsdb_monitor.py b/neutron/agent/linux/ovsdb_monitor.py index 4dcdc57e9..c49bdc5f1 100644 --- a/neutron/agent/linux/ovsdb_monitor.py +++ b/neutron/agent/linux/ovsdb_monitor.py @@ -69,6 +69,10 @@ class SimpleInterfaceMonitor(OvsdbMonitor): respawn_interval=respawn_interval, ) self.data_received = False + if respawn_interval: + self._default_timeout = respawn_interval / 2 + else: + self._default_timeout = 10 @property def is_active(self): @@ -87,7 +91,8 @@ class SimpleInterfaceMonitor(OvsdbMonitor): """ 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() if block: eventlet.timeout.Timeout(timeout) -- 2.45.2