openstack/nova
Code Issues Proposed changes

Merge "Removes the delta file once image is extracted"

Browse Source
This commit is contained in:
Zuul 2020-08-18 01:01:50 +00:00 committed by Gerrit Code Review
commit 87269dcaee
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19883,10 +19883,11 @@ class LibvirtConnTestCase(test.NoDBTestCase,
disconnect_volume.assert_called_once_with(self.context,
mock.sentinel.new_connection_info, instance)
@mock.patch.object(fileutils, 'delete_if_exists')
@mock.patch('nova.virt.libvirt.guest.BlockDevice.is_job_complete')
@mock.patch('nova.privsep.path.chown')
def _test_live_snapshot(
self, mock_chown, mock_is_job_complete,
self, mock_chown, mock_is_job_complete, mock_delete,
can_quiesce=False, require_quiesce=False):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI())
mock_dom = mock.MagicMock()
@ -19944,6 +19945,7 @@ class LibvirtConnTestCase(test.NoDBTestCase,
mock_chown.assert_called_once_with(dltfile, uid=os.getuid())
mock_snapshot.assert_called_once_with(dltfile, "qcow2",
dstfile, "qcow2")
mock_delete.assert_called_once_with(dltfile)
mock_define.assert_called_once_with(xmldoc)
mock_quiesce.assert_any_call(mock.ANY, self.test_instance,
mock.ANY, True)

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

@ -2679,6 +2679,10 @@ class LibvirtDriver(driver.ComputeDriver):
libvirt_utils.extract_snapshot(disk_delta, 'qcow2',
out_path, image_format)
# Remove the disk_delta file once the snapshot extracted, so that
# it doesn't hang around till the snapshot gets uploaded
fileutils.delete_if_exists(disk_delta)
def _volume_snapshot_update_status(self, context, snapshot_id, status):
"""Send a snapshot status update to Cinder.