openstack
/
ironic-python-agent
Code Issues Proposed changes

Software RAID: Don't delete partitions too early 

Partions on the holder disk should only be deleted after
all RAID devices have been deleted. Otherwise, super blocks
on partitions which reside on the same disks cannot be cleaned.

Story: #2008199
Task: #40979
Change-Id: I19293f5b992cd1fa68957d6f306dcec8f3b7a820
(cherry picked from commit c7aec775ff)
This commit is contained in:
Arne Wiebalck 2020-09-28 10:31:15 +02:00
parent 1a29800cc5
commit 43fdcb39cb
3 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ironic_python_agent/hardware.py
View File

@ -1825,6 +1825,7 @@ class GenericHardwareManager(HardwareManager):
raise errors.SoftwareRAIDError(msg)
def _delete_config_pass(self, raid_devices):
all_holder_disks = []
for raid_device in raid_devices:
component_devices = _get_component_devices(raid_device.name)
if not component_devices:
@ -1877,14 +1878,11 @@ class GenericHardwareManager(HardwareManager):
LOG.warning('Failed to remove superblock from %s: %s',
raid_device.name, e)
# Remove the partitions we created during create_configuration.
for holder_disk in holder_disks:
LOG.debug('Removing partitions on %s', holder_disk)
try:
utils.execute('wipefs', '-af', holder_disk)
except processutils.ProcessExecutionError:
LOG.warning('Failed to remove partitions on %s',
holder_disk)
# NOTE(arne_wiebalck): We cannot delete the partitions right
# away since there may be other partitions on the same disks
# which are members of other RAID devices. So we remember them
# for later.
all_holder_disks.extend(holder_disks)
LOG.info('Deleted Software RAID device %s', raid_device.name)
@ -1930,6 +1928,17 @@ class GenericHardwareManager(HardwareManager):
LOG.warning('Failed to remove superblock from %s: %s',
raid_device.name, e)
# Erase all partition tables we created
all_holder_disks_uniq = list(
collections.OrderedDict.fromkeys(all_holder_disks))
for holder_disk in all_holder_disks_uniq:
LOG.info('Removing partitions on holder disk %s', holder_disk)
try:
utils.execute('wipefs', '-af', holder_disk)
except processutils.ProcessExecutionError as e:
LOG.warning('Failed to remove partitions on %s',
holder_disk, e)
LOG.debug("Finished deleting Software RAID(s)")
def validate_configuration(self, raid_config, node):

8
ironic_python_agent/tests/unit/test_hardware.py
View File

@ -3972,8 +3972,6 @@ class TestGenericHardwareManager(base.IronicAgentTest):
mock.call('mdadm', '--examine', '/dev/sdb1',
use_standard_locale=True),
mock.call('mdadm', '--zero-superblock', '/dev/sdb1'),
mock.call('wipefs', '-af', '/dev/sda'),
mock.call('wipefs', '-af', '/dev/sdb'),
mock.call('wipefs', '-af', '/dev/md1'),
mock.call('mdadm', '--stop', '/dev/md1'),
mock.call('mdadm', '--examine', '/dev/sda2',
@ -3982,15 +3980,17 @@ class TestGenericHardwareManager(base.IronicAgentTest):
mock.call('mdadm', '--examine', '/dev/sdb2',
use_standard_locale=True),
mock.call('mdadm', '--zero-superblock', '/dev/sdb2'),
mock.call('wipefs', '-af', '/dev/sda'),
mock.call('wipefs', '-af', '/dev/sdb'),
mock.call('mdadm', '--examine', '/dev/sdc',
use_standard_locale=True),
mock.call('mdadm', '--zero-superblock', '/dev/sdc'),
mock.call('mdadm', '--examine', '/dev/sdb',
use_standard_locale=True),
mock.call('mdadm', '--zero-superblock', '/dev/sdb'),
mock.call('mdadm', '--examine', '/dev/sda',
use_standard_locale=True),
mock.call('mdadm', '--zero-superblock', '/dev/sda'),
mock.call('wipefs', '-af', '/dev/sda'),
mock.call('wipefs', '-af', '/dev/sdb'),
mock.call('mdadm', '--assemble', '--scan', check_exit_code=False),
])

6
releasenotes/notes/fix_partition_cleanup-46491861c930db12.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes a bug where the partitions created during software RAID setup are cleaned
too early and therefore may prevent the proper cleaning of the md superblocks.
Leaving superblocks behind will impact the creation of new md devices later on.