diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-17 12:02:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-17 12:02:15 +0000 |
| commit | 17a233cf77f811f278dfb4b64dd0b0d76ad4b719 (patch) | |
| tree | bf622d4675cdbc3b157fe5d3013ce090e434d8c1 | |
| parent | e3250402e87d99f9d0f46812ea2421c16eceb2c8 (diff) | |
| parent | 06df7cae31246e233dd5cf9b92c6484b519156de (diff) | |
| download | nova-17a233cf77f811f278dfb4b64dd0b0d76ad4b719.tar.gz | |
Merge "Removes the delta file once image is extracted" into stable/train
| -rw-r--r-- | nova/tests/unit/virt/libvirt/test_driver.py | 4 | ||||
| -rw-r--r-- | nova/virt/libvirt/driver.py | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index f1ee842ac5..3b131f4da7 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -19187,10 +19187,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() @@ -19248,6 +19249,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) diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index acea96a24b..f4df91e494 100644 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -2637,6 +2637,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. |