openstack/ironic-python-agent
Code Issues Proposed changes

Re-read the partition table with partx -a

Browse Source 
Re-read the partition table with 'partx -a', rather than 'partx -u'.

This should fix an timing issue where the bootloader installation
fails to mount the EFI partition from a whole disk image since it
is not yet aware of the new partitions (observed with both, the
iscsi and the direct deploy interface).

Change-Id: If5da3075e813ae01df3decf8f0647aba111b0515
(cherry picked from commit dc8c1f16f9)
(cherry picked from commit ab3e8a75ba)
This commit is contained in:
Arne Wiebalck
2021-11-06 13:28:06 +01:00
committed by Steve Baker
parent 9525a11528
commit 06cf7f3d0c
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ironic_python_agent/extensions/image.py
View File

@@ -63,7 +63,7 @@ def _rescan_device(device):
kernel partition records. kernel partition records.
""" """
try: try:
utils.execute('partx', '-u', device, attempts=3, utils.execute('partx', '-a', device, attempts=3,
delay_on_retry=True) delay_on_retry=True)
utils.execute('udevadm', 'settle') utils.execute('udevadm', 'settle')
except processutils.ProcessExecutionError: except processutils.ProcessExecutionError:

28
ironic_python_agent/tests/unit/extensions/test_image.py
View File

@@ -254,7 +254,7 @@ class TestImageExtension(base.IronicAgentTest):
('', ''), ('', '')]) ('', ''), ('', '')])
expected = [mock.call('efibootmgr', '--version'), expected = [mock.call('efibootmgr', '--version'),
mock.call('partx', '-u', '/dev/fake', attempts=3, mock.call('partx', '-a', '/dev/fake', attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
@@ -302,7 +302,7 @@ class TestImageExtension(base.IronicAgentTest):
('', ''), ('', '')]) ('', ''), ('', '')])
expected = [mock.call('efibootmgr', '--version'), expected = [mock.call('efibootmgr', '--version'),
mock.call('partx', '-u', '/dev/fake', attempts=3, mock.call('partx', '-a', '/dev/fake', attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
@@ -359,7 +359,7 @@ Boot0002 VENDMAGIC FvFile(9f3c6294-bf9b-4208-9808-be45dfc34b51)
('', ''), ('', '')]) ('', ''), ('', '')])
expected = [mock.call('efibootmgr', '--version'), expected = [mock.call('efibootmgr', '--version'),
mock.call('partx', '-u', '/dev/fake', attempts=3, mock.call('partx', '-a', '/dev/fake', attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
@@ -421,7 +421,7 @@ Boot0004* ironic1 HD(1,GPT,55db8d03-c8f6-4a5b-9155-790dddc348fa,0x800,0x640
('', ''), ('', ''), ('', ''), ('', ''),
('', ''), ('', '')]) ('', ''), ('', '')])
expected = [mock.call('efibootmgr', '--version'), expected = [mock.call('efibootmgr', '--version'),
mock.call('partx', '-u', '/dev/fake', attempts=3, mock.call('partx', '-a', '/dev/fake', attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
@@ -474,7 +474,7 @@ Boot0004* ironic1 HD(1,GPT,55db8d03-c8f6-4a5b-9155-790dddc348fa,0x800,0x640
('', '')]) ('', '')])
expected = [mock.call('efibootmgr', '--version'), expected = [mock.call('efibootmgr', '--version'),
mock.call('partx', '-u', '/dev/fake', attempts=3, mock.call('partx', '-a', '/dev/fake', attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
@@ -1978,7 +1978,7 @@ Boot0004* ironic1 HD(1,GPT,55db8d03-c8f6-4a5b-9155-790dddc348fa,0x800,0x640
root_part = image._get_partition(self.fake_dev, self.fake_root_uuid) root_part = image._get_partition(self.fake_dev, self.fake_root_uuid)
self.assertEqual('/dev/test2', root_part) self.assertEqual('/dev/test2', root_part)
expected = [mock.call('partx', '-u', self.fake_dev, attempts=3, expected = [mock.call('partx', '-a', self.fake_dev, attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE', mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE',
@@ -2002,7 +2002,7 @@ Boot0004* ironic1 HD(1,GPT,55db8d03-c8f6-4a5b-9155-790dddc348fa,0x800,0x640
self.assertRaises(errors.DeviceNotFound, self.assertRaises(errors.DeviceNotFound,
image._get_partition, self.fake_dev, image._get_partition, self.fake_dev,
self.fake_root_uuid) self.fake_root_uuid)
expected = [mock.call('partx', '-u', self.fake_dev, attempts=3, expected = [mock.call('partx', '-a', self.fake_dev, attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE', mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE',
@@ -2025,7 +2025,7 @@ Boot0004* ironic1 HD(1,GPT,55db8d03-c8f6-4a5b-9155-790dddc348fa,0x800,0x640
result = image._get_partition(self.fake_dev, self.fake_root_uuid) result = image._get_partition(self.fake_dev, self.fake_root_uuid)
self.assertEqual('/dev/loop0', result) self.assertEqual('/dev/loop0', result)
expected = [mock.call('partx', '-u', self.fake_dev, attempts=3, expected = [mock.call('partx', '-a', self.fake_dev, attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE', mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE',
@@ -2045,7 +2045,7 @@ Boot0004* ironic1 HD(1,GPT,55db8d03-c8f6-4a5b-9155-790dddc348fa,0x800,0x640
image._get_partition, self.fake_dev, image._get_partition, self.fake_dev,
self.fake_root_uuid) self.fake_root_uuid)
expected = [mock.call('partx', '-u', self.fake_dev, attempts=3, expected = [mock.call('partx', '-a', self.fake_dev, attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE', mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE',
@@ -2064,7 +2064,7 @@ Boot0004* ironic1 HD(1,GPT,55db8d03-c8f6-4a5b-9155-790dddc348fa,0x800,0x640
root_part = image._get_partition(self.fake_dev, self.fake_root_uuid) root_part = image._get_partition(self.fake_dev, self.fake_root_uuid)
self.assertEqual('/dev/test2', root_part) self.assertEqual('/dev/test2', root_part)
expected = [mock.call('partx', '-u', self.fake_dev, attempts=3, expected = [mock.call('partx', '-a', self.fake_dev, attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE', mock.call('lsblk', '-PbioKNAME,UUID,PARTUUID,TYPE',
@@ -2178,7 +2178,7 @@ Boot0004* ironic1 HD(1,GPT,55db8d03-c8f6-4a5b-9155-790dddc348fa,0x800,0x640
('', ''), ('', ''), ('', ''), ('', ''),
('', '')]) ('', '')])
expected = [mock.call('partx', '-u', '/dev/fake', attempts=3, expected = [mock.call('partx', '-a', '/dev/fake', attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
@@ -2233,7 +2233,7 @@ Boot0002: VENDMAGIC FvFile(9f3c6294-bf9b-4208-9808-be45dfc34b51)
('', ''), ('', ''), ('', ''), ('', ''),
('', '')]) ('', '')])
expected = [mock.call('partx', '-u', '/dev/fake', attempts=3, expected = [mock.call('partx', '-a', '/dev/fake', attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,
@@ -2275,7 +2275,7 @@ Boot0002: VENDMAGIC FvFile(9f3c6294-bf9b-4208-9808-be45dfc34b51)
('', ''), ('', ''), ('', ''), ('', ''),
('', '')]) ('', '')])
expected = [mock.call('partx', '-u', '/dev/fakenvme0', attempts=3, expected = [mock.call('partx', '-a', '/dev/fakenvme0', attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', '/dev/fakenvme0p1', mock.call('mount', '/dev/fakenvme0p1',
@@ -2315,7 +2315,7 @@ Boot0002: VENDMAGIC FvFile(9f3c6294-bf9b-4208-9808-be45dfc34b51)
('', ''), ('', ''), ('', ''), ('', ''),
('', '')]) ('', '')])
expected = [mock.call('partx', '-u', '/dev/fake', attempts=3, expected = [mock.call('partx', '-a', '/dev/fake', attempts=3,
delay_on_retry=True), delay_on_retry=True),
mock.call('udevadm', 'settle'), mock.call('udevadm', 'settle'),
mock.call('mount', self.fake_efi_system_part, mock.call('mount', self.fake_efi_system_part,

5
releasenotes/notes/fix-rescan-device-7b00c6836b687ce8.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
fixes:
- |
Fixes an issue where partitions are not visible due to a
incorrect call to have the partition table re-read.