openstack
/
neutron
Code Issues Proposed changes

Merge "Adjust some HA router log"

This commit is contained in:
Zuul 2019-07-07 21:52:11 +00:00 committed by Gerrit Code Review
parent 58d4382cb9 426a5b2833
commit 412924ae17
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/agent/l3/ha.py
View File

@ -113,14 +113,16 @@ class AgentMixin(object):
return self.conf.ha_vrrp_advert_int
def enqueue_state_change(self, router_id, state):
state_change_data = {"router_id": router_id, "state": state}
LOG.info('Router %(router_id)s transitioned to %(state)s',
state_change_data)
ri = self._get_router_info(router_id)
if ri is None:
return
state_change_data = {"router_id": router_id, "state": state,
"host": ri.agent.host}
LOG.info('Router %(router_id)s transitioned to %(state)s on '
'agent %(host)s',
state_change_data)
# TODO(dalvarez): Fix bug 1677279 by moving the IPv6 parameters
# configuration to keepalived-state-change in order to remove the
# dependency that currently exists on l3-agent running for the IPv6

4
neutron/agent/l3/ha_router.py
View File

@ -394,6 +394,10 @@ class HaRouter(router.RouterInfo):
pm.enable()
process_monitor.register(
self.router_id, IP_MONITOR_PROCESS_SERVICE, pm)
LOG.debug("Router %(router_id)s %(process)s pid %(pid)d",
{"router_id": self.router_id,
"process": KEEPALIVED_STATE_CHANGE_MONITOR_SERVICE_NAME,
"pid": pm.pid})
def destroy_state_change_monitor(self, process_monitor):
if not self.ha_port:

4
neutron/tests/unit/agent/l3/test_agent.py
View File

@ -243,12 +243,14 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
router = mock.Mock()
router_info = mock.MagicMock()
router_info.agent = agent
agent.router_info[router.id] = router_info
agent.l3_ext_manager.ha_state_change = mock.Mock()
agent.enqueue_state_change(router.id, 'master')
agent.l3_ext_manager.ha_state_change.assert_called_once_with(
agent.context,
{'router_id': router.id, 'state': 'master'})
{'router_id': router.id, 'state': 'master',
'host': agent.host})
def test_enqueue_state_change_router_active_ha(self):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)