openstack
/
neutron
Code Issues Proposed changes

Merge "Add "rpc_response_max_timeout" config variable in OVS agent"

This commit is contained in:
Zuul 2019-03-01 12:09:18 +00:00 committed by Gerrit Code Review
parent 376fa8aef4 84f8ae9d1f
commit 7fbba811ed
5 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/cmd/ovs_cleanup.py
View File

@ -21,6 +21,7 @@ from neutron.common import config
from neutron.conf.agent import cmd
from neutron.conf.agent import common as agent_config
from neutron.conf.agent.l3 import config as l3_config
from neutron.conf import service as service_config
LOG = logging.getLogger(__name__)
@ -41,6 +42,7 @@ def setup_conf():
l3_config.register_l3_agent_config_opts(l3_config.OPTS, conf)
agent_config.register_interface_driver_opts_helper(conf)
agent_config.register_interface_opts()
service_config.register_service_opts(service_config.RPC_EXTRA_OPTS, conf)
conf.set_default("ovsdb_timeout", CLEANUP_OVSDB_TIMEOUT, "OVS")
return conf

8
neutron/conf/service.py
View File

@ -19,7 +19,7 @@ from oslo_config import cfg
from neutron._i18n import _
service_opts = [
SERVICE_OPTS = [
cfg.IntOpt('periodic_interval',
default=40,
help=_('Seconds between running periodic tasks.')),
@ -41,9 +41,13 @@ service_opts = [
help=_('Range of seconds to randomly delay when starting the '
'periodic task scheduler to reduce stampeding. '
'(Disable by setting to 0)')),
]
RPC_EXTRA_OPTS = [
cfg.IntOpt('rpc_response_max_timeout',
default=600,
help=_('Maximum seconds to wait for a response from a call.')),
help=_('Maximum seconds to wait for a response from an RPC '
'call.')),
]

13
neutron/opts.py
View File

@ -134,7 +134,8 @@ def list_opts():
neutron.conf.common.core_cli_opts,
neutron.conf.common.core_opts,
neutron.conf.wsgi.socket_opts,
neutron.conf.service.service_opts)
neutron.conf.service.SERVICE_OPTS,
neutron.conf.service.RPC_EXTRA_OPTS)
),
(neutron.conf.common.NOVA_CONF_SECTION,
itertools.chain(
@ -149,7 +150,8 @@ def list_base_agent_opts():
('DEFAULT',
itertools.chain(
neutron.conf.agent.common.INTERFACE_OPTS,
neutron.conf.agent.common.INTERFACE_DRIVER_OPTS)
neutron.conf.agent.common.INTERFACE_DRIVER_OPTS,
neutron.conf.service.RPC_EXTRA_OPTS)
),
('agent', neutron.conf.agent.common.AGENT_STATE_OPTS),
('ovs',
@ -201,7 +203,8 @@ def list_l3_agent_opts():
('DEFAULT',
itertools.chain(
neutron.conf.agent.l3.config.OPTS,
neutron.conf.service.service_opts,
neutron.conf.service.SERVICE_OPTS,
neutron.conf.service.RPC_EXTRA_OPTS,
neutron.conf.agent.l3.ha.OPTS,
neutron.conf.agent.common.PD_DRIVER_OPTS,
neutron.conf.agent.common.RA_OPTS)
@ -269,6 +272,10 @@ def list_ml2_conf_opts():
def list_ovs_opts():
return [
('DEFAULT',
itertools.chain(
neutron.conf.service.RPC_EXTRA_OPTS)
),
('ovs',
itertools.chain(
neutron.conf.plugins.ml2.drivers.ovs_conf.ovs_opts,

2
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
View File

@ -59,6 +59,7 @@ from neutron.common import constants as c_const
from neutron.common import utils as n_utils
from neutron.conf.agent import common as agent_config
from neutron.conf.agent import xenapi_conf
from neutron.conf import service as service_conf
from neutron.plugins.ml2.drivers.agent import capabilities
from neutron.plugins.ml2.drivers.l2pop.rpc_manager import l2population_rpc
from neutron.plugins.ml2.drivers.openvswitch.agent.common \
@ -2353,6 +2354,7 @@ def main(bridge_classes):
ovs_capabilities.register()
ext_manager.register_opts(cfg.CONF)
agent_config.setup_privsep()
service_conf.register_service_opts(service_conf.RPC_EXTRA_OPTS, cfg.CONF)
ext_mgr = ext_manager.L2AgentExtensionsManager(cfg.CONF)

3
neutron/service.py
View File

@ -41,7 +41,8 @@ from neutron.conf import service
from neutron import wsgi
service.register_service_opts(service.service_opts)
service.register_service_opts(service.SERVICE_OPTS)
service.register_service_opts(service.RPC_EXTRA_OPTS)
LOG = logging.getLogger(__name__)