Merge lp:~jaypipes/glance/bug759018 into lp:~glance-coresec/glance/cactus-trunk
Proposed by
Jay Pipes
Status: | Merged |
---|---|
Approved by: | Jay Pipes |
Approved revision: | 114 |
Merged at revision: | 113 |
Proposed branch: | lp:~jaypipes/glance/bug759018 |
Merge into: | lp:~glance-coresec/glance/cactus-trunk |
Diff against target: |
100 lines (+24/-22) 2 files modified
glance/server.py (+20/-22) tests/functional/test_curl_api.py (+4/-0) |
To merge this branch: | bzr merge lp:~jaypipes/glance/bug759018 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Rick Harris (community) | Approve | ||
Review via email:
|
Description of the change
Removes capture of exception from eventlet in _upload_
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.
To post a comment you must log in.
> 47 + raise HTTPConflict(msg, request=req)
> 52 + raise HTTPBadRequest(msg, request=req)
Looks like `msg` needs interpolation. Perhaps:
msg = ("Attempt to upload duplicate image: %s" % str(e))
> 15 + logger.debug(msg)
> 33 + logger.debug(msg)
Might be better to log this at the error level so it's more in our face.
Otherwise, looks good and tests pass.