openstack/neutron
Code Issues Proposed changes

Merge "Log a warning if pid file could not be read in l3-agent"

Browse Source
This commit is contained in:
Zuul
2024-08-26 13:25:24 +00:00
committed by Gerrit Code Review
parent f19bbae345 b9ca288a5d
commit e2bc6a8ef1
2 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -450,10 +450,18 @@ 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})
pid = pm.pid
process = KEEPALIVED_STATE_CHANGE_MONITOR_SERVICE_NAME
if pid:
LOG.debug("Router %(router_id)s %(process)s pid %(pid)d",
{"router_id": self.router_id,
"process": process,
"pid": pid})
else:
LOG.warning("Could not determine pid for router %(router_id)s "
"%(process)s, might still be spawning",
{"router_id": self.router_id,
"process": process})
def destroy_state_change_monitor(self, process_monitor):
if not self.ha_port:

28
neutron/tests/unit/agent/l3/test_ha_router.py
View File

@@ -127,6 +127,34 @@ class TestBasicRouterOperations(base.BaseTestCase):
ri.remove_floating_ip(device, fip_cidr)
self.assertTrue(super_remove_floating_ip.called)
@mock.patch.object(ha_router.LOG, 'debug')
def test_spawn_state_change_monitor(self, mock_log):
ri = self._create_router(mock.MagicMock())
with mock.patch.object(ri,
'_get_state_change_monitor_process_manager')\
as m_get_state:
mock_pm = m_get_state.return_value
mock_pm.active = True
mock_pm.pid = 1234
ri.spawn_state_change_monitor(mock_pm)
mock_pm.enable.assert_called_once()
mock_log.assert_called_once()
@mock.patch.object(ha_router.LOG, 'warning')
def test_spawn_state_change_monitor_no_pid(self, mock_log):
ri = self._create_router(mock.MagicMock())
with mock.patch.object(ri,
'_get_state_change_monitor_process_manager')\
as m_get_state:
mock_pm = m_get_state.return_value
mock_pm.active = True
mock_pm.pid = None
ri.spawn_state_change_monitor(mock_pm)
mock_pm.enable.assert_called_once()
mock_log.assert_called_once()
def test_destroy_state_change_monitor_ok(self):
ri = self._create_router(mock.MagicMock())
# need a port for destroy_state_change_monitor() to call PM code