openstack/cinder
Code Issues Proposed changes

Merge "Label temporary files created by image_utils"

Browse Source
This commit is contained in:
Zuul 2021-03-11 01:29:12 +00:00 committed by Gerrit Code Review
commit bc85d5206e
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cinder/image/image_utils.py
View File

@ -643,7 +643,7 @@ def fetch_to_volume_format(context, image_service,
# large and cause disk full errors which would confuse users.
# Unfortunately it seems that you can't pipe to 'qemu-img convert' because
# it seeks. Maybe we can think of something for a future version.
with temporary_file() as tmp:
with temporary_file(prefix='image_download_%s_' % image_id) as tmp:
has_meta = False if not image_meta else True
try:
format_raw = True if image_meta['disk_format'] == 'raw' else False
@ -761,7 +761,7 @@ def upload_volume(context, image_service, image_meta, volume_path,
base_image_ref=base_image_ref)
return
with temporary_file() as tmp:
with temporary_file(prefix='vol_upload_') as tmp:
LOG.debug("%s was %s, converting to %s",
image_id, volume_format, image_meta['disk_format'])
@ -995,7 +995,8 @@ class TemporaryImages(object):
@contextlib.contextmanager
def fetch(cls, image_service, context, image_id, suffix=''):
tmp_images = cls.for_image_service(image_service).temporary_images
with temporary_file(suffix=suffix) as tmp:
with temporary_file(prefix='image_fetch_%s_' % image_id,
suffix=suffix) as tmp:
fetch_verify_image(context, image_service, image_id, tmp)
user = context.user_id
if not tmp_images.get(user):

36
cinder/tests/unit/test_image_utils.py
View File

@ -1149,7 +1149,8 @@ class TestFetchToVolumeFormat(test.TestCase):
volume_format, blocksize)
self.assertIsNone(output)
mock_temp.assert_called_once_with()
mock_temp.assert_called_once_with(prefix='image_download_%s_' %
image_id)
mock_info.assert_has_calls([
mock.call(tmp, force_share=False, run_as_root=True),
mock.call(tmp, run_as_root=True)])
@ -1201,7 +1202,8 @@ class TestFetchToVolumeFormat(test.TestCase):
run_as_root=run_as_root)
self.assertIsNone(output)
mock_temp.assert_called_once_with()
mock_temp.assert_called_once_with(prefix='image_download_%s_' %
image_id)
mock_info.assert_has_calls([
mock.call(tmp, force_share=False, run_as_root=run_as_root),
mock.call(tmp, run_as_root=run_as_root)])
@ -1257,7 +1259,8 @@ class TestFetchToVolumeFormat(test.TestCase):
run_as_root=run_as_root)
self.assertIsNone(output)
mock_temp.assert_called_once_with()
mock_temp.assert_called_once_with(prefix='image_download_%s_' %
image_id)
mock_info.assert_has_calls([
mock.call(tmp, force_share=False, run_as_root=run_as_root),
mock.call(tmp, run_as_root=run_as_root)])
@ -1309,7 +1312,8 @@ class TestFetchToVolumeFormat(test.TestCase):
run_as_root=run_as_root)
self.assertIsNone(output)
mock_temp.assert_called_once_with()
mock_temp.assert_called_once_with(prefix='image_download_%s_' %
image_id)
mock_info.assert_has_calls([
mock.call(tmp, force_share=False, run_as_root=run_as_root),
mock.call(tmp, run_as_root=run_as_root)])
@ -1413,7 +1417,8 @@ class TestFetchToVolumeFormat(test.TestCase):
self.assertIsNone(output)
image_service.show.assert_called_once_with(ctxt, image_id)
mock_temp.assert_called_once_with()
mock_temp.assert_called_once_with(prefix='image_download_%s_' %
image_id)
mock_info.assert_called_once_with(tmp,
force_share=False,
run_as_root=run_as_root)
@ -1460,7 +1465,8 @@ class TestFetchToVolumeFormat(test.TestCase):
run_as_root=run_as_root)
image_service.show.assert_called_once_with(ctxt, image_id)
mock_temp.assert_called_once_with()
mock_temp.assert_called_once_with(prefix='image_download_%s_' %
image_id)
mock_info.assert_called_once_with(tmp,
force_share=False,
run_as_root=run_as_root)
@ -1505,7 +1511,8 @@ class TestFetchToVolumeFormat(test.TestCase):
run_as_root=run_as_root)
image_service.show.assert_called_once_with(ctxt, image_id)
mock_temp.assert_called_once_with()
mock_temp.assert_called_once_with(prefix='image_download_%s_' %
image_id)
mock_info.assert_called_once_with(tmp,
force_share=False,
run_as_root=run_as_root)
@ -1556,7 +1563,8 @@ class TestFetchToVolumeFormat(test.TestCase):
run_as_root=run_as_root)
image_service.show.assert_called_once_with(ctxt, image_id)
mock_temp.assert_called_once_with()
mock_temp.assert_called_once_with(prefix='image_download_%s_' %
image_id)
mock_info.assert_has_calls([
mock.call(tmp, force_share=False, run_as_root=run_as_root),
mock.call(tmp, run_as_root=run_as_root)])
@ -1604,7 +1612,8 @@ class TestFetchToVolumeFormat(test.TestCase):
run_as_root=run_as_root)
image_service.show.assert_called_once_with(ctxt, image_id)
mock_temp.assert_called_once_with()
mock_temp.assert_called_once_with(prefix='image_download_%s_' %
image_id)
mock_info.assert_has_calls([
mock.call(tmp, force_share=False, run_as_root=run_as_root),
mock.call(tmp, run_as_root=run_as_root)])
@ -1652,7 +1661,8 @@ class TestFetchToVolumeFormat(test.TestCase):
run_as_root=run_as_root)
image_service.show.assert_called_once_with(ctxt, image_id)
mock_temp.assert_called_once_with()
mock_temp.assert_called_once_with(prefix='image_download_%s_' %
image_id)
mock_info.assert_has_calls([
mock.call(tmp, force_share=False, run_as_root=run_as_root),
mock.call(tmp, run_as_root=run_as_root)])
@ -1701,7 +1711,8 @@ class TestFetchToVolumeFormat(test.TestCase):
run_as_root=run_as_root)
self.assertIsNone(output)
mock_temp.assert_called_once_with()
mock_temp.assert_called_once_with(prefix='image_download_%s_' %
image_id)
mock_info.assert_has_calls([
mock.call(tmp, force_share=False, run_as_root=run_as_root),
mock.call(tmp, run_as_root=run_as_root)])
@ -1859,7 +1870,8 @@ class TestFetchToVolumeFormat(test.TestCase):
volume_format, blocksize)
self.assertIsNone(output)
mock_temp.assert_called_once_with()
mock_temp.assert_called_once_with(prefix='image_download_%s_' %
image_id)
mock_info.assert_has_calls([
mock.call(tmp, force_share=False, run_as_root=True),
mock.call(tmp, run_as_root=True)])