openstack/swift
Code Issues Proposed changes

Fixing SLO range requests

Browse Source 
Change-Id: I355e99c971cfe8f7f8dedcd8f9f08c97079863cc
This commit is contained in:
David Goetz
2013-03-26 09:40:03 -07:00
parent 60489cdedd
commit d2d9a15ddf
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
swift/proxy/controllers/obj.py
View File

@@ -167,16 +167,12 @@ class SegmentedIterable(object):
'Could not load object segment %(path)s:' 'Could not load object segment %(path)s:'
' %(status)s') % {'path': path, 'status': resp.status_int}) ' %(status)s') % {'path': path, 'status': resp.status_int})
if self.is_slo: if self.is_slo:
if (resp.content_length != self.segment_dict['bytes'] or if resp.etag != self.segment_dict['hash']:
resp.etag != self.segment_dict['hash']):
raise SloSegmentError(_( raise SloSegmentError(_(
'Object segment no longer valid: ' 'Object segment no longer valid: '
'%(path)s etag: %(r_etag)s != %(s_etag)s or ' '%(path)s etag: %(r_etag)s != %(s_etag)s.' %
'size: %(r_size)s != %(s_size)s') %
{'path': path, 'r_etag': resp.etag, {'path': path, 'r_etag': resp.etag,
's_etag': self.segment_dict['hash'], 's_etag': self.segment_dict['hash']}))
'r_size': resp.content_length,
's_size': self.segment_dict['bytes']})
self.segment_iter = resp.app_iter self.segment_iter = resp.app_iter
# See NOTE: swift_conn at top of file about this. # See NOTE: swift_conn at top of file about this.
self.segment_iter_swift_conn = getattr(resp, 'swift_conn', None) self.segment_iter_swift_conn = getattr(resp, 'swift_conn', None)