openstack/deb-swift
Code Issues Proposed changes

Made ranged requests on large objects working correctly when size of manifest file is not 0 byte.

Browse Source 
Fixed bug 969411

Ranged GET request checked wheter the object is large objects only when response is 416 Requested Range Not Satisfiable.

All ranged GET requests should check the object is large object or not because size of the manifest file can be larger than 0.

Change-Id: Ia3632252d6879a773be881149c10ce0f5ffbcd82
This commit is contained in:
Iryoung Jeong
2012-06-23 05:19:00 +09:00
parent c16b70bb3d
commit 49a9cc7e68
2 changed files with 112 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
swift/proxy/server.py
View File

@@ -895,16 +895,18 @@ class ObjectController(Controller):
resp = self.GETorHEAD_base(req, _('Object'), partition,
self.iter_nodes(partition, nodes, self.app.object_ring),
req.path_info, len(nodes))
# If we get a 416 Requested Range Not Satisfiable we have to check if
# we were actually requesting a manifest and then redo
# the range request on the whole object.
if resp.status_int == HTTP_REQUESTED_RANGE_NOT_SATISFIABLE:
# Whether we get a 416 Requested Range Not Satisfiable or not,
# we should request a manifest because size of manifest file
# can be not 0. After checking a manifest, redo the range request
# on the whole object.
if req.range:
req_range = req.range
req.range = None
resp2 = self.GETorHEAD_base(req, _('Object'), partition,
self.iter_nodes(partition, nodes, self.app.object_ring),
req.path_info, len(nodes))
self.iter_nodes(partition,
nodes,
self.app.object_ring),
req.path_info, len(nodes))
if 'x-object-manifest' not in resp2.headers:
self.app.logger.timing_since(
'%s.timing' % (stats_type,), start_time)