Merge "Override ovsdb_timeout default value in ovs_cleanup tool"
This commit is contained in:
commit
482a9ed880
|
@ -26,6 +26,10 @@ from neutron.plugins.ml2.drivers.openvswitch.agent.common import constants
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
# Default ovsdb_timeout value for this script.
|
||||||
|
# It allows to clean bridges with even thousands of ports.
|
||||||
|
CLEANUP_OVSDB_TIMEOUT = 600
|
||||||
|
|
||||||
|
|
||||||
def setup_conf():
|
def setup_conf():
|
||||||
"""Setup the cfg for the clean up utility.
|
"""Setup the cfg for the clean up utility.
|
||||||
|
@ -39,6 +43,7 @@ def setup_conf():
|
||||||
l3_config.register_l3_agent_config_opts(l3_config.OPTS, conf)
|
l3_config.register_l3_agent_config_opts(l3_config.OPTS, conf)
|
||||||
agent_config.register_interface_driver_opts_helper(conf)
|
agent_config.register_interface_driver_opts_helper(conf)
|
||||||
agent_config.register_interface_opts()
|
agent_config.register_interface_opts()
|
||||||
|
conf.set_default("ovsdb_timeout", CLEANUP_OVSDB_TIMEOUT, "OVS")
|
||||||
return conf
|
return conf
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fixes bug `1763604 <https://bugs.launchpad.net/neutron/+bug/1763604>`_.
|
||||||
|
Override default value of ``ovsdb_timeout`` config option in
|
||||||
|
``neutron-ovs-cleanup`` script.
|
||||||
|
The default value is 10 seconds, but that is not enough for the
|
||||||
|
``neutron-ovs-cleanup`` script when there are many ports to remove from
|
||||||
|
a single bridge, for example, 5000. Because of that, we now override the
|
||||||
|
default value for the config option to be 600 seconds (10 minutes).
|
||||||
|
issues:
|
||||||
|
- |
|
||||||
|
In the case when the number of ports to clean up in a single bridge is
|
||||||
|
larger than about 10000, it might require an increase in the
|
||||||
|
``ovsdb_timeout`` config option to some value higher than 600 seconds.
|
Loading…
Reference in New Issue