openstack/swift
Code Issues Proposed changes

Only retry GETs for objects.

Browse Source 
Change-Id: I8b6ceeaa0e5e247e45209deced808b0b78181d53
This commit is contained in:
David Goetz 2013-12-12 16:28:40 -08:00
parent c8c512b977
commit 03513a02a2
2 changed files with 14 additions and 13 deletions
swift/proxy/controllers
base.py
test/unit/proxy
test_server.py

2
swift/proxy/controllers/base.py

@ -628,7 +628,7 @@ class GetOrHeadHandler(object):
bytes_read_from_source += len(chunk)
except ChunkReadTimeout:
exc_type, exc_value, exc_traceback = exc_info()
if self.newest:
if self.newest or self.server_type != 'Object':
raise exc_type, exc_value, exc_traceback
try:
self.fast_forward(bytes_read_from_source)

25
test/unit/proxy/test_server.py

@ -2306,18 +2306,6 @@ class TestObjectController(unittest.TestCase):
def test_node_read_timeout_retry(self):
with save_globals():
self.app.account_ring.get_nodes('account')
for dev in self.app.account_ring.devs.values():
dev['ip'] = '127.0.0.1'
dev['port'] = 1
self.app.container_ring.get_nodes('account')
for dev in self.app.container_ring.devs.values():
dev['ip'] = '127.0.0.1'
dev['port'] = 1
self.app.object_ring.get_nodes('account')
for dev in self.app.object_ring.devs.values():
dev['ip'] = '127.0.0.1'
dev['port'] = 1
req = Request.blank('/v1/a/c/o', environ={'REQUEST_METHOD': 'GET'})
self.app.update_request(req)
@ -5976,6 +5964,19 @@ class TestContainerController(unittest.TestCase):
'X-Account-Device': 'sdc'}
])
def test_node_read_timeout_retry_to_container(self):
with save_globals():
req = Request.blank('/v1/a/c', environ={'REQUEST_METHOD': 'GET'})
self.app.node_timeout = 0.1
set_http_connect(200, 200, 200, body='abcdef', slow=[2])
resp = req.get_response(self.app)
got_exc = False
try:
resp.body
except ChunkReadTimeout:
got_exc = True
self.assert_(got_exc)
class TestAccountController(unittest.TestCase):