Use InternalError for unexpected server errors
'InvalidURI' doesn't give correct information about what happened. 'InternalError' is much better. Change-Id: Id88ac87d6097dc8d2ff67bcad28059f8ea187ec4
This commit is contained in:
MORITA Kazutaka
parent
e3ee641242
commit
2e78cd0355
@ -65,7 +65,8 @@ import re
|
||||
from swift.common.utils import get_logger
|
||||
from swift.common.swob import Request, Response, HTTPForbidden, HTTPConflict, \
|
||||
HTTPBadRequest, HTTPMethodNotAllowed, HTTPNotFound, HTTPNotImplemented, \
|
||||
HTTPLengthRequired, HTTPServiceUnavailable, HTTPNoContent, HTTPOk
|
||||
HTTPLengthRequired, HTTPServiceUnavailable, HTTPNoContent, HTTPOk, \
|
||||
HTTPInternalServerError
|
||||
from swift.common.http import HTTP_OK, HTTP_CREATED, HTTP_ACCEPTED, \
|
||||
HTTP_NO_CONTENT, HTTP_UNAUTHORIZED, HTTP_FORBIDDEN, HTTP_NOT_FOUND, \
|
||||
HTTP_CONFLICT, HTTP_UNPROCESSABLE_ENTITY, is_success, \
|
||||
@ -97,6 +98,9 @@ def get_err_response(code):
|
||||
(HTTPConflict, 'The requested bucket name is not available'),
|
||||
'BucketNotEmpty':
|
||||
(HTTPConflict, 'The bucket you tried to delete is not empty'),
|
||||
'InternalError':
|
||||
(HTTPInternalServerError, 'We encountered an internal error. '
|
||||
'Please try again.'),
|
||||
'InvalidArgument':
|
||||
(HTTPBadRequest, 'Invalid Argument'),
|
||||
'InvalidBucketName':
|
||||
@ -406,7 +410,7 @@ class ServiceController(Controller):
|
||||
if status in (HTTP_UNAUTHORIZED, HTTP_FORBIDDEN):
|
||||
return get_err_response('AccessDenied')
|
||||
else:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
containers = loads(resp.body)
|
||||
# we don't keep the creation time of a backet (s3cmd doesn't
|
||||
@ -474,7 +478,7 @@ class BucketController(Controller):
|
||||
elif status == HTTP_NOT_FOUND:
|
||||
return get_err_response('NoSuchBucket')
|
||||
else:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
objects = loads(resp.body)
|
||||
body = ('<?xml version="1.0" encoding="UTF-8"?>'
|
||||
@ -548,7 +552,7 @@ class BucketController(Controller):
|
||||
elif status == HTTP_ACCEPTED:
|
||||
return get_err_response('BucketAlreadyExists')
|
||||
else:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
return HTTPOk(headers={'Location': self.container_name})
|
||||
|
||||
@ -567,7 +571,7 @@ class BucketController(Controller):
|
||||
elif status == HTTP_CONFLICT:
|
||||
return get_err_response('BucketNotEmpty')
|
||||
else:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
return HTTPNoContent()
|
||||
|
||||
@ -607,7 +611,7 @@ class ObjectController(Controller):
|
||||
elif status == HTTP_NOT_FOUND:
|
||||
return get_err_response('NoSuchKey')
|
||||
else:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
def HEAD(self, req):
|
||||
"""
|
||||
@ -655,7 +659,7 @@ class ObjectController(Controller):
|
||||
elif status == HTTP_REQUEST_ENTITY_TOO_LARGE:
|
||||
return get_err_response('EntityTooLarge')
|
||||
else:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
if 'HTTP_X_COPY_FROM' in req.environ:
|
||||
body = '<CopyObjectResult>' \
|
||||
@ -675,7 +679,7 @@ class ObjectController(Controller):
|
||||
try:
|
||||
resp = req.get_response(self.app)
|
||||
except Exception:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
status = resp.status_int
|
||||
|
||||
@ -685,7 +689,7 @@ class ObjectController(Controller):
|
||||
elif status == HTTP_NOT_FOUND:
|
||||
return get_err_response('NoSuchKey')
|
||||
else:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
return HTTPNoContent()
|
||||
|
||||
@ -726,7 +730,7 @@ class AclController(Controller):
|
||||
elif status == HTTP_NOT_FOUND:
|
||||
return get_err_response('NoSuchKey')
|
||||
else:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
else:
|
||||
# Handle Bucket ACL
|
||||
@ -742,7 +746,7 @@ class AclController(Controller):
|
||||
elif status == HTTP_NOT_FOUND:
|
||||
return get_err_response('NoSuchBucket')
|
||||
else:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
def PUT(self, req):
|
||||
"""
|
||||
@ -773,7 +777,7 @@ class AclController(Controller):
|
||||
elif status == HTTP_ACCEPTED:
|
||||
return get_err_response('BucketAlreadyExists')
|
||||
else:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
return HTTPOk(headers={'Location': self.container_name})
|
||||
|
||||
@ -796,7 +800,7 @@ class LocationController(Controller):
|
||||
elif status == HTTP_NOT_FOUND:
|
||||
return get_err_response('NoSuchBucket')
|
||||
else:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
body = ('<?xml version="1.0" encoding="UTF-8"?>'
|
||||
'<LocationConstraint '
|
||||
@ -830,7 +834,7 @@ class LoggingStatusController(Controller):
|
||||
elif status == HTTP_NOT_FOUND:
|
||||
return get_err_response('NoSuchBucket')
|
||||
else:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
# logging disabled
|
||||
body = ('<?xml version="1.0" encoding="UTF-8"?>'
|
||||
@ -901,7 +905,8 @@ class MultiObjectDeleteController(Controller):
|
||||
if status == HTTP_UNAUTHORIZED:
|
||||
body += get_err_elem(key, 'AccessDenied', 'Access Denied')
|
||||
else:
|
||||
body += get_err_elem(key, 'InvalidURI', 'Invalid URI')
|
||||
body += get_err_elem(key, 'InternalError',
|
||||
'Internal Error')
|
||||
|
||||
body += '</DeleteResult>\r\n'
|
||||
return HTTPOk(body=body)
|
||||
@ -1002,7 +1007,7 @@ class VersioningController(Controller):
|
||||
elif status == HTTP_NOT_FOUND:
|
||||
return get_err_response('NoSuchBucket')
|
||||
else:
|
||||
return get_err_response('InvalidURI')
|
||||
return get_err_response('InternalError')
|
||||
|
||||
# Just report there is no versioning configured here.
|
||||
body = ('<VersioningConfiguration '
|
||||
|
||||
@ -209,7 +209,7 @@ class TestSwift3(unittest.TestCase):
|
||||
code = self._test_method_error('GET', '', swob.HTTPForbidden)
|
||||
self.assertEquals(code, 'AccessDenied')
|
||||
code = self._test_method_error('GET', '', swob.HTTPServerError)
|
||||
self.assertEquals(code, 'InvalidURI')
|
||||
self.assertEquals(code, 'InternalError')
|
||||
|
||||
def test_service_GET(self):
|
||||
req = Request.blank('/',
|
||||
@ -242,7 +242,7 @@ class TestSwift3(unittest.TestCase):
|
||||
code = self._test_method_error('GET', '/bucket', swob.HTTPNotFound)
|
||||
self.assertEquals(code, 'NoSuchBucket')
|
||||
code = self._test_method_error('GET', '/bucket', swob.HTTPServerError)
|
||||
self.assertEquals(code, 'InvalidURI')
|
||||
self.assertEquals(code, 'InternalError')
|
||||
|
||||
def test_bucket_GET(self):
|
||||
bucket_name = 'junk'
|
||||
@ -356,7 +356,7 @@ class TestSwift3(unittest.TestCase):
|
||||
code = self._test_method_error('PUT', '/bucket', swob.HTTPAccepted)
|
||||
self.assertEquals(code, 'BucketAlreadyExists')
|
||||
code = self._test_method_error('PUT', '/bucket', swob.HTTPServerError)
|
||||
self.assertEquals(code, 'InvalidURI')
|
||||
self.assertEquals(code, 'InternalError')
|
||||
|
||||
def test_bucket_PUT(self):
|
||||
req = Request.blank('/bucket',
|
||||
@ -377,7 +377,7 @@ class TestSwift3(unittest.TestCase):
|
||||
self.assertEquals(code, 'BucketNotEmpty')
|
||||
code = self._test_method_error('DELETE', '/bucket',
|
||||
swob.HTTPServerError)
|
||||
self.assertEquals(code, 'InvalidURI')
|
||||
self.assertEquals(code, 'InternalError')
|
||||
|
||||
def test_bucket_DELETE(self):
|
||||
req = Request.blank('/bucket',
|
||||
@ -447,7 +447,7 @@ class TestSwift3(unittest.TestCase):
|
||||
self.assertEquals(code, 'NoSuchKey')
|
||||
code = self._test_method_error('GET', '/bucket/object',
|
||||
swob.HTTPServerError)
|
||||
self.assertEquals(code, 'InvalidURI')
|
||||
self.assertEquals(code, 'InternalError')
|
||||
|
||||
def test_object_GET(self):
|
||||
self._test_object_GETorHEAD('GET')
|
||||
@ -478,7 +478,7 @@ class TestSwift3(unittest.TestCase):
|
||||
self.assertEquals(code, 'EntityTooLarge')
|
||||
code = self._test_method_error('PUT', '/bucket/object',
|
||||
swob.HTTPServerError)
|
||||
self.assertEquals(code, 'InvalidURI')
|
||||
self.assertEquals(code, 'InternalError')
|
||||
|
||||
def test_object_PUT(self):
|
||||
req = Request.blank(
|
||||
@ -525,7 +525,7 @@ class TestSwift3(unittest.TestCase):
|
||||
self.assertEquals(code, 'NoSuchKey')
|
||||
code = self._test_method_error('DELETE', '/bucket/object',
|
||||
swob.HTTPServerError)
|
||||
self.assertEquals(code, 'InvalidURI')
|
||||
self.assertEquals(code, 'InternalError')
|
||||
|
||||
def test_object_DELETE(self):
|
||||
req = Request.blank('/bucket/object',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user