openstack/swift
Code Issues Proposed changes

small refactors

Browse Source
This commit is contained in:
Michael Barton
2011-02-24 09:02:50 +00:00
parent c6f1137191
commit e1bd4e8769
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
swift/proxy/server.py
View File

@@ -521,11 +521,12 @@ class Controller(object):
handoff nodes as needed.
"""
nodes = self.iter_nodes(part, ring.get_part_nodes(part), ring)
pool = GreenPile(ring.replica_count)
for head in headers:
pool.spawn(self._make_request, nodes, part, method, path,
head, query_string)
response = [resp for resp in pool if resp]
with ContextPool(ring.replica_count) as pool:
pile = GreenPile(pool)
for head in headers:
pile.spawn(self._make_request, nodes, part, method, path,
head, query_string)
response = [resp for resp in pile if resp]
while len(response) < ring.replica_count:
response.append((503, '', ''))
statuses, reasons, bodies = zip(*response)
@@ -919,15 +920,12 @@ class ObjectController(Controller):
content_type_manually_set = True
if not req.headers.get('content-type'):
guessed_type, _junk = mimetypes.guess_type(req.path_info)
if not guessed_type:
req.headers['Content-Type'] = 'application/octet-stream'
else:
req.headers['Content-Type'] = guessed_type
req.headers['Content-Type'] = guessed_type or \
'application/octet-stream'
content_type_manually_set = False
error_response = check_object_creation(req, self.object_name)
if error_response:
return error_response
conns = []
data_source = \
iter(lambda: req.body_file.read(self.app.client_chunk_size), '')
source_header = req.headers.get('X-Copy-From')
@@ -1017,7 +1015,7 @@ class ObjectController(Controller):
for conn in list(conns):
if not conn.failed:
conn.queue.put('%x\r\n%s\r\n' % (len(chunk), chunk)
if chunked else chunk)
if chunked else chunk)
else:
conns.remove(conn)
if len(conns) <= len(nodes) / 2: