openstack
/
ironic-lib
Code Issues Proposed changes

Wait for a config drive device to be available 

A failure may occur if the dd to config drive partition happens
before it actually becomes available. This change adds a udevadm
settle call that ensures that config drive device is present in
/dev folder.

Closes-Bug: #1633063
Change-Id: I5526f791371e7a6f4cdad151bb163707504e76cf
This commit is contained in:
Vladyslav Drok 2016-10-17 23:12:02 +03:00
parent 5b9239dbbe
commit 939c026950
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ironic_lib/disk_utils.py
View File

@ -772,6 +772,11 @@ def create_config_drive_partition(node_uuid, device, configdrive):
else:
config_drive_part = '%s%s' % (device, new_part.pop())
# NOTE(vdrok): the partition was created successfully, let's wait
# for it to appear in /dev.
utils.execute('udevadm', 'settle',
'--exit-if-exists=%s' % config_drive_part)
dd(confdrive_file, config_drive_part)
LOG.info(_LI("Configdrive for node %(node)s successfully "
"copied onto partition %(part)s"),

36
ironic_lib/tests/test_disk_utils.py
View File

@ -21,7 +21,6 @@ import shutil
import stat
import tempfile
from oslo_concurrency import processutils
from oslo_config import cfg
from oslo_service import loopingcall
@ -940,9 +939,9 @@ class WholeDiskConfigDriveTestCases(test_base.BaseTestCase):
autospec=True)
def test_create_partition_gpt(self, mock_get_configdrive,
mock_get_labelled_partition,
mock_list_partitions,
mock_is_disk_gpt, mock_fix_gpt,
mock_dd, mock_unlink, mock_execute):
mock_list_partitions, mock_is_disk_gpt,
mock_fix_gpt, mock_dd, mock_unlink,
mock_execute):
config_url = 'http://1.2.3.4/cd'
configdrive_file = '/tmp/xyz'
configdrive_mb = 10
@ -973,8 +972,12 @@ class WholeDiskConfigDriveTestCases(test_base.BaseTestCase):
expected_part = '/dev/fake4'
disk_utils.create_config_drive_partition(self.node_uuid, self.dev,
config_url)
mock_execute.assert_called_with('sgdisk', '-n', '0:-64MB:0',
self.dev, run_as_root=True)
mock_execute.assert_has_calls([
mock.call('sgdisk', '-n', '0:-64MB:0', self.dev,
run_as_root=True),
mock.call('udevadm', 'settle',
'--exit-if-exists=%s' % expected_part),
])
self.assertEqual(2, mock_list_partitions.call_count)
mock_is_disk_gpt.assert_called_with(self.dev, self.node_uuid)
mock_fix_gpt.assert_called_with(self.dev, self.node_uuid)
@ -1050,16 +1053,21 @@ class WholeDiskConfigDriveTestCases(test_base.BaseTestCase):
mock_get_configdrive.assert_called_with(config_url, self.node_uuid)
if disk_size_exceeds_max:
self.assertEqual(1, mock_log.call_count)
mock_execute.assert_called_with('parted', '-a', 'optimal', '-s',
'--', self.dev, 'mkpart',
'primary', 'ext2', 2097087,
2097151, run_as_root=True)
parted_call = mock.call('parted', '-a', 'optimal', '-s',
'--', self.dev, 'mkpart',
'primary', 'ext2', 2097087,
2097151, run_as_root=True)
else:
self.assertEqual(0, mock_log.call_count)
mock_execute.assert_called_with('parted', '-a', 'optimal', '-s',
'--', self.dev, 'mkpart',
'primary', 'ext2', '-64MiB',
'-0', run_as_root=True)
parted_call = mock.call('parted', '-a', 'optimal', '-s',
'--', self.dev, 'mkpart',
'primary', 'ext2', '-64MiB',
'-0', run_as_root=True)
mock_execute.assert_has_calls([
parted_call,
mock.call('udevadm', 'settle',
'--exit-if-exists=%s' % expected_part),
])
self.assertEqual(2, mock_list_partitions.call_count)
mock_is_disk_gpt.assert_called_with(self.dev, self.node_uuid)
mock_disk_exceeds.assert_called_with(self.dev, self.node_uuid)