openstack/nova
Code Issues Proposed changes

Merge "libvirt: Get info with abs path, rebase with rel path" into stable/2025.1

Browse Source
This commit is contained in:
Zuul
2026-02-03 20:15:19 +00:00
committed by Gerrit Code Review
parent e178e62149 d0003d6bf6
commit b4fde794d0
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/virt/libvirt/test_driver.py
View File

@@ -29941,7 +29941,7 @@ class LibvirtVolumeSnapshotTestCase(test.NoDBTestCase):
"/var/lib/nova/instances/%s/snap.img" % instance.uuid)
mock_execute.assert_called_once_with(
'qemu-img', 'rebase',
'-b', '/var/lib/nova/instances/%s/snap.img' % instance.uuid,
'-b', 'snap.img',
'-F', 'fake_fmt',
'/var/lib/nova/instances/%s/disk1_file' % instance.uuid)

15
nova/virt/libvirt/driver.py
View File

@@ -3820,17 +3820,24 @@ class LibvirtDriver(driver.ComputeDriver):
# If the rebased image is going to have a backing file then
# explicitly set the backing file format to avoid any security
# concerns related to file format auto detection.
if os.path.isabs(rebase_base):
backing_file = rebase_base
backing_file = rebase_base
# We will need the absolute path to the backing file in order to
# call images.qemu_img_info() as it checks for path existence.
# We still want to do the rebase itself with a relative path if a
# relative path was given, so that Cinder will also be able to
# successfully reference the backing file in its environment.
if os.path.isabs(backing_file):
backing_file_abs = backing_file
else:
# this is a probably a volume snapshot case where the
# rebase_base is relative. See bug
# https://bugs.launchpad.net/nova/+bug/1885528
backing_file_name = os.path.basename(rebase_base)
volume_path = os.path.dirname(source_path)
backing_file = os.path.join(volume_path, backing_file_name)
backing_file_abs = os.path.join(volume_path, backing_file_name)
b_file_fmt = images.qemu_img_info(backing_file).file_format
b_file_fmt = images.qemu_img_info(backing_file_abs).file_format
qemu_img_extra_arg = ['-F', b_file_fmt]
qemu_img_extra_arg.append(source_path)