x/vmware-nsx
Code Issues Proposed changes

Merge "Change report_interval from 4 to 30, agent_down_time from 9 to 75"

Browse Source
This commit is contained in:
Jenkins 2014-03-20 04:39:12 +00:00 committed by Gerrit Code Review
commit 4a8f514519
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/neutron.conf
View File

@ -225,7 +225,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
# =========== items for agent management extension ============= # =========== items for agent management extension =============
# Seconds to regard the agent as down; should be at least twice # Seconds to regard the agent as down; should be at least twice
# report_interval, to be sure the agent is down for good # report_interval, to be sure the agent is down for good
# agent_down_time = 9 # agent_down_time = 75
# =========== end of items for agent management extension ===== # =========== end of items for agent management extension =====
# =========== items for agent scheduler extension ============= # =========== items for agent scheduler extension =============
@ -385,7 +385,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
# =========== items for agent management extension ============= # =========== items for agent management extension =============
# seconds between nodes reporting state to server; should be less than # 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 # agent_down_time, best if it is half or less than agent_down_time
# report_interval = 4 # report_interval = 30
# =========== end of items for agent management extension ===== # =========== end of items for agent management extension =====

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

@ -32,7 +32,7 @@ ROOT_HELPER_OPTS = [
] ]
AGENT_STATE_OPTS = [ AGENT_STATE_OPTS = [
cfg.FloatOpt('report_interval', default=4, cfg.FloatOpt('report_interval', default=30,
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 ' 'should be less than agent_down_time, best if it '
'is half or less than agent_down_time.')), 'is half or less than agent_down_time.')),

2
neutron/db/agents_db.py
View File

@ -33,7 +33,7 @@ from neutron.openstack.common import timeutils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
cfg.CONF.register_opt( cfg.CONF.register_opt(
cfg.IntOpt('agent_down_time', default=9, cfg.IntOpt('agent_down_time', default=75,
help=_("Seconds to regard the agent is down; should be at " help=_("Seconds to regard the agent is down; should be at "
"least twice report_interval, to be sure the " "least twice report_interval, to be sure the "
"agent is down for good."))) "agent is down for good.")))

2
neutron/tests/unit/nec/test_nec_agent.py
View File

@ -195,7 +195,7 @@ class TestNecAgent(TestNecAgentBase):
def test_report_state_installed(self): def test_report_state_installed(self):
self.loopingcall.assert_called_once_with(self.agent._report_state) self.loopingcall.assert_called_once_with(self.agent._report_state)
instance = self.loopingcall.return_value instance = self.loopingcall.return_value
instance.start.assert_called_once_with(interval=4) self.assertTrue(instance.start.called)
def _check_report_state(self, cur_ports, num_ports, fail_mode, def _check_report_state(self, cur_ports, num_ports, fail_mode,
first=False): first=False):