Merge lp:~mirantis/glance/body_file-fix into lp:~hudson-openstack/glance/trunk

[Yuriy Taraday]

Switch image_data to be a file-like object instead of bare string in image creating and updating
Without this Glance loads all image into memory, then copies it one time, then writes it to temp file, and only after all this copies image to target repository.

[Brian Waldon (bcwaldon)]

Looks good, Yuriy.

review: Approve

[Jay Pipes (jaypipes)]

Excellent catch. :)

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~mirantis/glance/body_file-fix into lp:glance failed. Below is the output from the failed tests.

running test
running egg_info
creating glance.egg-info
writing glance.egg-info/PKG-INFO
writing top-level names to glance.egg-info/top_level.txt
writing dependency_links to glance.egg-info/dependency_links.txt
writing manifest file 'glance.egg-info/SOURCES.txt'
reading manifest file 'glance.egg-info/SOURCES.txt'
reading manifest template 'MANIFEST.in'
warning: no files found matching 'ChangeLog'
writing manifest file 'glance.egg-info/SOURCES.txt'
running build_ext

We test the following: ... ok
We test the following: ... ok
Test for LP Bugs #736295, #767203 ... ok
We test conditions that produced LP Bug #768969, where an image ... ok
Set up three test images and ensure each query param filter works ... ok
We test the following sequential series of actions: ... ok
Ensure marker and limit query params work ... ok
We test the process flow where a user registers an image ... ok
A test against the actual datastore backend for the registry ... ok
A test that errors coming from the POST API do not ... ok
We test that various calls to the images and root endpoints are ... ok
We test the following sequential series of actions: ... ok
Test logging output proper when verbose and debug ... ok
Test logging output proper when verbose and debug ... ok
A test for LP bug #704854 -- Exception thrown by registry ... ok
Tests raises BadRequest for invalid store header ... ok
Tests to add a basic image in the file store ... ok
Tests creates a queued image for no body and no loc header ... ok
Tests creates a queued image for no body and no loc header ... ok
Test that the image contents are checksummed properly ... ok
test_bad_container_format (tests.unit.test_api.TestGlanceAPI) ... ok
test_bad_disk_format (tests.unit.test_api.TestGlanceAPI) ... ok
test_delete_image (tests.unit.test_api.TestGlanceAPI) ... ok
test_delete_non_exists_image (tests.unit.test_api.TestGlanceAPI) ... ok
Here, we try to delete an image that is in the queued state. ... ok
Test that the ETag header matches the x-image-meta-checksum ... ok
Test that the image contents are checksummed properly ... ok
Test for HEAD /images/<ID> ... ok
test_show_image_basic (tests.unit.test_api.TestGlanceAPI) ... ok
test_show_non_exists_image (tests.unit.test_api.TestGlanceAPI) ... ok
Tests that the /images POST registry API creates the image ... ok
Tests proper exception is raised if a bad disk_format is set ... ok
Tests proper exception is raised if a bad disk_format is set ... ok
Tests proper exception is raised if a bad status is set ... ok
Tests that exception raised for bad matching disk and container ... ok
Tests that the /images DELETE registry API deletes the image ... ok
Tests proper exception is raised if attempt to delete non-existing ... ok
Tests that the /images/detail registry API returns ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/detail registry API returns list of ... ok
Tests that the /images/d...

[lp:~mirantis/glance/body_file-fix]

143. By Yuriy Taraday on 2011-06-27

Add myself to Authors file.

[Yuriy Taraday (yorik-sar)]

Fixed.

[Brian Waldon (bcwaldon)]

review: Approve

=== modified file 'Authors'
--- Authors	2011-06-16 00:08:33 +0000
+++ Authors	2011-06-27 05:20:30 +0000
@@ -19,3 +19,4 @@
 Taku Fukushima <[e-mail]>
 Thierry Carrez <[e-mail]>
 Vishvananda Ishaya <[e-mail]>
+Yuriy Taraday <[e-mail]>

=== modified file 'glance/api/v1/images.py'
--- glance/api/v1/images.py	2011-06-24 20:27:25 +0000
+++ glance/api/v1/images.py	2011-06-27 05:20:30 +0000
@@ -509,7 +509,7 @@
     def _deserialize(self, request):
         result = {}
         result['image_meta'] = utils.get_image_meta_from_headers(request)
-        data = request.body if self.has_body(request) else None
+        data = request.body_file if self.has_body(request) else None
         result['image_data'] = data
         return result