openstack/swift
Code Issues Proposed changes

Merge "xlo: 5xx while validating first segment is a server error"

Browse Source
This commit is contained in:
Zuul 2020-11-20 01:13:26 +00:00 committed by Gerrit Code Review
commit e22cad666a
4 changed files with 57 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swift/common/middleware/dlo.py
View File

@ -126,7 +126,7 @@ from hashlib import md5
from swift.common import constraints from swift.common import constraints
from swift.common.exceptions import ListingIterError, SegmentError from swift.common.exceptions import ListingIterError, SegmentError
from swift.common.http import is_success from swift.common.http import is_success
from swift.common.swob import Request, Response, \ from swift.common.swob import Request, Response, HTTPException, \
HTTPRequestedRangeNotSatisfiable, HTTPBadRequest, HTTPConflict, \ HTTPRequestedRangeNotSatisfiable, HTTPBadRequest, HTTPConflict, \
str_to_wsgi, wsgi_to_str, wsgi_quote, wsgi_unquote, normalize_etag str_to_wsgi, wsgi_to_str, wsgi_quote, wsgi_unquote, normalize_etag
from swift.common.utils import get_logger, \ from swift.common.utils import get_logger, \
@ -355,6 +355,8 @@ class GetContext(WSGIContext):
try: try:
app_iter.validate_first_segment() app_iter.validate_first_segment()
except HTTPException as err_resp:
return err_resp
except (SegmentError, ListingIterError): except (SegmentError, ListingIterError):
return HTTPConflict(request=req) return HTTPConflict(request=req)

17
swift/common/request_helpers.py
View File

@ -32,7 +32,7 @@ from swift import gettext_ as _
from swift.common.constraints import AUTO_CREATE_ACCOUNT_PREFIX from swift.common.constraints import AUTO_CREATE_ACCOUNT_PREFIX
from swift.common.storage_policy import POLICIES from swift.common.storage_policy import POLICIES
from swift.common.exceptions import ListingIterError, SegmentError from swift.common.exceptions import ListingIterError, SegmentError
from swift.common.http import is_success from swift.common.http import is_success, is_server_error
from swift.common.swob import HTTPBadRequest, \ from swift.common.swob import HTTPBadRequest, \
HTTPServiceUnavailable, Range, is_chunked, multi_range_iterator, \ HTTPServiceUnavailable, Range, is_chunked, multi_range_iterator, \
HTTPPreconditionFailed, wsgi_to_bytes, wsgi_unquote, wsgi_to_str HTTPPreconditionFailed, wsgi_to_bytes, wsgi_unquote, wsgi_to_str
@ -568,13 +568,16 @@ class SegmentedIterable(object):
body = seg_resp.body body = seg_resp.body
if not six.PY2: if not six.PY2:
body = body.decode('utf8') body = body.decode('utf8')
raise SegmentError( msg = 'While processing manifest %s, got %d (%s) ' \
'While processing manifest %s, ' 'while retrieving %s' % (
'got %d (%s) while retrieving %s' % self.name, seg_resp.status_int,
(self.name, seg_resp.status_int,
body if len(body) <= 60 else body[:57] + '...', body if len(body) <= 60 else body[:57] + '...',
seg_req.path)) seg_req.path)
if is_server_error(seg_resp.status_int):
self.logger.error(msg)
raise HTTPServiceUnavailable(
request=seg_req, content_type='text/plain')
raise SegmentError(msg)
elif ((seg_etag and (seg_resp.etag != seg_etag)) or elif ((seg_etag and (seg_resp.etag != seg_etag)) or
(seg_size and (seg_resp.content_length != seg_size) and (seg_size and (seg_resp.content_length != seg_size) and
not seg_req.range)): not seg_req.range)):

18
test/unit/common/middleware/test_dlo.py
View File

@ -583,7 +583,23 @@ class TestDloGetManifest(DloTestCase):
self.assertFalse('If-Modified-Since' in hdrs) self.assertFalse('If-Modified-Since' in hdrs)
self.assertFalse('If-Unmodified-Since' in hdrs) self.assertFalse('If-Unmodified-Since' in hdrs)
def test_error_fetching_first_segment(self): def test_server_error_fetching_first_segment(self):
self.app.register(
'GET', '/v1/AUTH_test/c/seg_01',
swob.HTTPServiceUnavailable, {}, None)
req = swob.Request.blank('/v1/AUTH_test/mancon/manifest',
environ={'REQUEST_METHOD': 'GET'})
status, headers, body = self.call_dlo(req)
self.assertEqual(status, "503 Service Unavailable")
self.assertEqual(self.app.unread_requests, {})
self.assertEqual(self.dlo.logger.get_lines_for_level('error'), [
'While processing manifest /v1/AUTH_test/mancon/manifest, '
'got 503 (<html><h1>Service Unavailable</h1><p>The server is '
'curren...) while retrieving /v1/AUTH_test/c/seg_01',
])
def test_client_error_fetching_first_segment(self):
self.app.register( self.app.register(
'GET', '/v1/AUTH_test/c/seg_01', 'GET', '/v1/AUTH_test/c/seg_01',
swob.HTTPForbidden, {}, None) swob.HTTPForbidden, {}, None)

26
test/unit/common/middleware/test_slo.py
View File

@ -3839,6 +3839,32 @@ class TestSloGetManifest(SloTestCase):
'gettest/not_exists_obj' 'gettest/not_exists_obj'
]) ])
def test_first_segment_not_available(self):
self.app.register('GET', '/v1/AUTH_test/gettest/not_avail_obj',
swob.HTTPServiceUnavailable, {}, None)
self.app.register('GET', '/v1/AUTH_test/gettest/manifest-not-avail',
swob.HTTPOk, {'Content-Type': 'application/json',
'X-Static-Large-Object': 'true'},
json.dumps([{'name': '/gettest/not_avail_obj',
'hash': md5hex('not_avail_obj'),
'content_type': 'text/plain',
'bytes': '%d' % len('not_avail_obj')
}]))
req = Request.blank('/v1/AUTH_test/gettest/manifest-not-avail',
environ={'REQUEST_METHOD': 'GET'})
status, headers, body = self.call_slo(req)
self.assertEqual('503 Service Unavailable', status)
self.assertEqual(self.app.unread_requests, {})
self.assertEqual(self.slo.logger.get_lines_for_level('error'), [
'While processing manifest /v1/AUTH_test/gettest/'
'manifest-not-avail, got 503 (<html><h1>Service Unavailable</h1>'
'<p>The server is curren...) while retrieving /v1/AUTH_test/'
'gettest/not_avail_obj'
])
self.assertIn(b'Service Unavailable', body)
def test_leading_data_segment(self): def test_leading_data_segment(self):
slo_etag = md5hex( slo_etag = md5hex(
md5hex('preamble') + md5hex('preamble') +