Increase timeout when waiting for dnsmasq enablement
In the reported bug, a regression was introduced in [1] when limiting
the time to have a "dnsmasq" process enabled. It has been reported, as
documented in the bug, that in older versions (Queens), using Python 2
[2] and older versions of "ip_lib" (not implementing most of the
commands using Pyroute2), that the time needed to spawn a "dnsmasq"
process exceeds the default 60 seconds defined in
"common_utils.wait_until_true".
This patch increases this time by a reasonable 300 seconds.
[1] https://review.opendev.org/#/c/643732
[2] https://bugs.python.org/issue35757
Change-Id: I2d8693145da72825876b951f2d10afe9ca28ff6e
Closes-Bug: #1849676
(cherry picked from commit aedc099176
)
This commit is contained in:
parent
ce3f2f7d26
commit
44c838e25f
|
@ -214,7 +214,7 @@ class DhcpLocalProcess(DhcpBase):
|
|||
def enable(self):
|
||||
"""Enables DHCP for this network by spawning a local process."""
|
||||
try:
|
||||
common_utils.wait_until_true(self._enable)
|
||||
common_utils.wait_until_true(self._enable, timeout=300)
|
||||
except common_utils.WaitTimeout:
|
||||
LOG.error("Failed to start DHCP process for network %s",
|
||||
self.network.id)
|
||||
|
|
Loading…
Reference in New Issue