Prevent timeouts when using fast-track with redfish-virtual-media

Calling prepare_ramdisk may break fast-track, as it's the case with
redfish-virtual-media (it powers nodes off unconditionally). To
avoid timeouts, check fast-track status again after prepare_ramdisk.

Change-Id: Iad2d6f4827bd7e8b2a02005fe18d31ec8d37db97
This commit is contained in:
Dmitry Tantsur 2020-10-30 16:41:01 +01:00
parent 2dfb3f5eca
commit 551ca9c8f7
3 changed files with 43 additions and 0 deletions

View File

@ -649,6 +649,9 @@ def prepare_inband_cleaning(task, manage_boot=True):
ramdisk_opts = build_agent_options(task.node)
task.driver.boot.prepare_ramdisk(task, ramdisk_opts)
# NOTE(dtantsur): calling prepare_ramdisk may power off the node, so we
# need to check fast-track again and reboot if needed.
fast_track = manager_utils.is_fast_track(task)
if not fast_track:
manager_utils.node_power_action(task, states.REBOOT)

View File

@ -1191,6 +1191,37 @@ class AgentMethodsTestCase(db_base.DbTestCase):
def test_prepare_inband_cleaning_fast_track(self):
self._test_prepare_inband_cleaning(fast_track=True)
@mock.patch('ironic.conductor.utils.power_on_node_if_needed',
autospec=True)
@mock.patch('ironic.conductor.utils.is_fast_track', autospec=True)
@mock.patch.object(pxe.PXEBoot, 'prepare_ramdisk', autospec=True)
@mock.patch('ironic.conductor.utils.node_power_action', autospec=True)
@mock.patch.object(utils, 'build_agent_options', autospec=True)
@mock.patch('ironic.drivers.modules.network.flat.FlatNetwork.'
'add_cleaning_network', autospec=True)
def test_prepare_inband_cleaning_broken_fast_track(
self, add_cleaning_network_mock,
build_options_mock, power_mock, prepare_ramdisk_mock,
is_fast_track_mock, power_on_if_needed_mock):
build_options_mock.return_value = {'a': 'b'}
is_fast_track_mock.side_effect = [True, False]
with task_manager.acquire(
self.context, self.node.uuid, shared=False) as task:
self.assertEqual(
states.CLEANWAIT,
utils.prepare_inband_cleaning(task))
add_cleaning_network_mock.assert_called_once_with(
task.driver.network, task)
power_mock.assert_called_once_with(task, states.REBOOT)
self.assertEqual(1, task.node.driver_internal_info[
'agent_erase_devices_iterations'])
self.assertIs(True, task.node.driver_internal_info[
'agent_erase_devices_zeroize'])
prepare_ramdisk_mock.assert_called_once_with(
mock.ANY, mock.ANY, {'a': 'b'})
build_options_mock.assert_called_once_with(task.node)
self.assertFalse(power_on_if_needed_mock.called)
@mock.patch('ironic.conductor.utils.is_fast_track', autospec=True)
@mock.patch.object(pxe.PXEBoot, 'clean_up_ramdisk', autospec=True)
@mock.patch('ironic.drivers.modules.network.flat.FlatNetwork.'

View File

@ -0,0 +1,9 @@
---
issues:
- |
When ``redfish-virtual-media`` is used, fast-track mode will not work as
expected, nodes will be rebooted between operations.
fixes:
- |
Fixes timeout in fast-track mode with ``redfish-virtual-media`` when
running one operation after another (e.g. cleaning after inspection).