summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorBrian Elliott <bdelliott@gmail.com>2014-06-10 16:46:15 +0000
committerBrian Elliott <bdelliott@gmail.com>2014-06-10 17:10:03 +0000
commit77aea0e6a3d77f3c747a3f0d7126a8fbfae94263 (patch)
treef76e5c61cfe588d1b8ff609aa7d31bbb8bd4d987 /plugins
parent3f2202a234bfca9dc9a873ffa6d5e7ad0850926a (diff)
downloadnova-77aea0e6a3d77f3c747a3f0d7126a8fbfae94263.tar.gz
xenapi: Do not retry snapshot upload on 500
If Glance returns a 500 response on an initial attempt to upload a snapshot image, it will set the image status to killed. Any retry attempts will fail with a 409 response. Hence, Nova should not attempt to retry the upload in this case, which will eliminate many pointless retries. Closes-Bug: 1349933 Change-Id: I1a8f2416923a368b02cf8963c747ebbb24d749a1
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/xenserver/xenapi/etc/xapi.d/plugins/glance3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index 8f3c16ff18..0eafa65029 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@@ -224,7 +224,8 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port,
httplib.REQUEST_ENTITY_TOO_LARGE,
httplib.PRECONDITION_FAILED,
httplib.CONFLICT,
- httplib.FORBIDDEN):
+ httplib.FORBIDDEN,
+ httplib.INTERNAL_SERVER_ERROR):
# No point in retrying for these conditions
raise PluginError("Got Error response [%i] while uploading "
"image [%s] "