diff options
author | Mark Beierl <mbeierl@vmware.com> | 2019-05-21 15:03:25 -0400 |
---|---|---|
committer | Mark Beierl <mbeierl@vmware.com> | 2019-07-16 09:08:20 -0400 |
commit | 62c95a7c966a4694082ba1e3f1b951ceb8facd2d (patch) | |
tree | 6e6330e7532c7f02bec1ea764c7f5f444d7067ee /ironic/tests/unit/drivers/modules/drac | |
parent | 10bf5d5c2afcac7315d7106dac0576d50f26c989 (diff) | |
download | ironic-62c95a7c966a4694082ba1e3f1b951ceb8facd2d.tar.gz |
Fix potential race condition on node power on and reboot
Currently there is the possibility that a configuration job
does not transition to the correct state and start execution
during a power on or reboot operation. If the boot device
is being changed, the system might complete its POST before
the job is ready, leaving the job in the queue, and the
system will boot from the wrong device.
This fix suggests the following change for the power control:
o During internal call to set boot device, poll the iDRAC job
queue for a configurable amount of time to ensure the job
is in the correct state
o Throw an exception on timeout if the job does not transition
to the correct state
o Proceed with normal logic as soon as the job is in the
correct state
This will ensure the iDRAC is in a state to execute the job
prior to the reboot starting, removing this race condition.
Story: #2004909
Task: #29259
Change-Id: I5cc71fb3c9a7e0166aab5bd458bbd257cefa8f5b
Diffstat (limited to 'ironic/tests/unit/drivers/modules/drac')
-rw-r--r-- | ironic/tests/unit/drivers/modules/drac/test_management.py | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/ironic/tests/unit/drivers/modules/drac/test_management.py b/ironic/tests/unit/drivers/modules/drac/test_management.py index 84a752c6b..e1f7df093 100644 --- a/ironic/tests/unit/drivers/modules/drac/test_management.py +++ b/ironic/tests/unit/drivers/modules/drac/test_management.py @@ -257,6 +257,10 @@ class DracManagementInternalMethodsTestCase(test_utils.BaseDracTest): mock_client = mock.Mock() mock_get_drac_client.return_value = mock_client mock_client.list_boot_devices.return_value = self.boot_devices['IPL'] + mock_job = mock.Mock() + mock_job.status = "Scheduled" + mock_client.get_job.return_value = mock_job + boot_device = {'boot_device': ironic.common.boot_devices.DISK, 'persistent': True} mock__get_boot_device.return_value = boot_device @@ -315,6 +319,10 @@ class DracManagementInternalMethodsTestCase(test_utils.BaseDracTest): mock_client = mock.Mock() mock_get_drac_client.return_value = mock_client mock_client.list_boot_devices.return_value = self.boot_devices['UEFI'] + + mock_job = mock.Mock() + mock_job.status = "Scheduled" + mock_client.get_job.return_value = mock_job boot_device = {'boot_device': ironic.common.boot_devices.PXE, 'persistent': False} mock__get_boot_device.return_value = boot_device @@ -445,6 +453,40 @@ class DracManagementInternalMethodsTestCase(test_utils.BaseDracTest): self.assertEqual(0, mock_client.set_bios_settings.call_count) self.assertEqual(0, mock_client.commit_pending_bios_changes.call_count) + @mock.patch('time.time') + @mock.patch('time.sleep') + @mock.patch.object(drac_mgmt, '_get_next_persistent_boot_mode', + spec_set=True, autospec=True) + @mock.patch.object(drac_mgmt, '_get_boot_device', spec_set=True, + autospec=True) + @mock.patch.object(drac_job, 'validate_job_queue', spec_set=True, + autospec=True) + def test_set_boot_device_job_not_scheduled( + self, + mock_validate_job_queue, + mock__get_boot_device, + mock__get_next_persistent_boot_mode, + mock_sleep, + mock_time, + mock_get_drac_client): + mock_client = mock.Mock() + mock_get_drac_client.return_value = mock_client + mock_client.list_boot_devices.return_value = self.boot_devices['IPL'] + mock_job = mock.Mock() + mock_job.status = "New" + mock_client.get_job.return_value = mock_job + mock_time.side_effect = [10, 50] + + boot_device = {'boot_device': ironic.common.boot_devices.DISK, + 'persistent': True} + mock__get_boot_device.return_value = boot_device + mock__get_next_persistent_boot_mode.return_value = 'IPL' + + self.assertRaises(exception.DracOperationError, + drac_mgmt.set_boot_device, self.node, + ironic.common.boot_devices.PXE, + persistent=True) + @mock.patch.object(drac_common, 'get_drac_client', spec_set=True, autospec=True) |