openstack/glance
Code Issues Proposed changes

Removes capture of exception from eventlet in _upload_and_activate(), which

Browse Source 
catches the exceptions that come from the _safe_kill() method properly.

Also fixes an incorrect call to _safe_kill() with mapping instead of image
ID in the block of code that kills an image if a bad checksum is given.

Fixes bug #759018.
This commit is contained in:
jaypipes@gmail.com 2011-04-13 12:44:47 -04:00
parent 1b84b48a24
commit ad4c92bada
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
glance/server.py
View File

@ -227,17 +227,20 @@ class Controller(wsgi.Controller):
:raises HTTPConflict if image already exists
:retval The location where the image was stored
"""
image_id = image_meta['id']
content_type = req.headers.get('content-type', 'notset')
if content_type != 'application/octet-stream':
raise HTTPBadRequest(
"Content-Type must be application/octet-stream")
self._safe_kill(req, image_id)
msg = ("Content-Type must be application/octet-stream")
logger.debug(msg)
raise HTTPBadRequest(msg, content_type="text/plain",
request=req)
store_name = req.headers.get(
'x-image-meta-store', self.options['default_store'])
store = self.get_store_or_400(req, store_name)
image_id = image_meta['id']
logger.debug("Setting image %s to status 'saving'"
% image_id)
registry.update_image_metadata(self.options, image_id,
@ -257,7 +260,8 @@ class Controller(wsgi.Controller):
"checksum generated from uploaded image "
"(%(checksum)s) did not match. Setting image "
"status to 'killed'.") % locals()
self._safe_kill(req, image_meta)
logger.debug(msg)
self._safe_kill(req, image_id)
raise HTTPBadRequest(msg, content_type="text/plain",
request=req)
@ -272,7 +276,8 @@ class Controller(wsgi.Controller):
return location
except exception.Duplicate, e:
logger.error("Error adding image to store: %s", str(e))
logger.error("Error uploading image to store: %s", str(e))
self._safe_kill(req, image_id)
raise HTTPConflict(str(e), request=req)
def _activate(self, req, image_id, location):
@ -329,22 +334,9 @@ class Controller(wsgi.Controller):
:retval Mapping of updated image data
"""
try:
image_id = image_meta['id']
location = self._upload(req, image_meta)
return self._activate(req, image_id, location)
except: # unqualified b/c we're re-raising it
exc_type, exc_value, exc_traceback = sys.exc_info()
self._safe_kill(req, image_id)
# NOTE(sirp): _safe_kill uses httplib which, in turn, uses
# Eventlet's GreenSocket. Eventlet subsequently clears exceptions
# by calling `sys.exc_clear()`.
#
# This is why we can't use a raise with no arguments here: our
# exception context was destroyed by Eventlet. To work around
# this, we need to 'memorize' the exception context, and then
# re-raise here.
raise exc_type(exc_value)
image_id = image_meta['id']
location = self._upload(req, image_meta)
return self._activate(req, image_id, location)
def create(self, req):
"""

4
tests/functional/test_curl_api.py
View File

@ -415,6 +415,8 @@ class TestCurlApi(functional.FunctionalTest):
"Size was supposed to be %d. Got:\n%s."
% (FIVE_GB, out))
self.stop_servers()
def test_traceback_not_consumed(self):
"""
A test that errors coming from the POST API do not
@ -447,3 +449,5 @@ class TestCurlApi(functional.FunctionalTest):
expected = "Content-Type must be application/octet-stream"
self.assertTrue(expected in out,
"Could not find '%s' in '%s'" % (expected, out))
self.stop_servers()