openstack
/
neutron
Code Issues Proposed changes

Merge "Tune up report and downtime intervals for l2 agent" into stable/havana

This commit is contained in:
Jenkins 2013-11-22 14:40:50 +00:00 committed by Gerrit Code Review
parent 8fdcb08ed3 ea25bc0051
commit 37f567879a
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etc/neutron.conf
View File

@ -211,8 +211,9 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
# max_fixed_ips_per_port = 5
# =========== items for agent management extension =============
# Seconds to regard the agent as down.
# agent_down_time = 5
# Seconds to regard the agent as down; should be at least twice
# report_interval, to be sure the agent is down for good
# agent_down_time = 9
# =========== end of items for agent management extension =====
# =========== items for agent scheduler extension =============
@ -297,8 +298,8 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
# root_helper = sudo
# =========== items for agent management extension =============
# seconds between nodes reporting state to server, should be less than
# agent_down_time
# seconds between nodes reporting state to server; should be less than
# agent_down_time, best if it is half or less than agent_down_time
# report_interval = 4
# =========== end of items for agent management extension =====

4
neutron/agent/common/config.py
View File

@ -33,7 +33,9 @@ ROOT_HELPER_OPTS = [
AGENT_STATE_OPTS = [
cfg.IntOpt('report_interval', default=4,
help=_('Seconds between nodes reporting state to server')),
help=_('Seconds between nodes reporting state to server; '
'should be less than agent_down_time, best if it '
'is half or less than agent_down_time.')),
]

6
neutron/db/agents_db.py
View File

@ -31,8 +31,10 @@ from neutron.openstack.common import timeutils
LOG = logging.getLogger(__name__)
cfg.CONF.register_opt(
cfg.IntOpt('agent_down_time', default=5,
help=_("Seconds to regard the agent is down.")))
cfg.IntOpt('agent_down_time', default=9,
help=_("Seconds to regard the agent is down; should be at "
"least twice report_interval, to be sure the "
"agent is down for good.")))
class Agent(model_base.BASEV2, models_v2.HasId):