openstack/swift
Code Issues Proposed changes

fixes

Browse Source
This commit is contained in:
Michael Barton
2011-02-24 09:46:08 +00:00
parent e1bd4e8769
commit e357ffcb18
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
swift/proxy/server.py
View File

@@ -521,12 +521,11 @@ class Controller(object):
handoff nodes as needed. handoff nodes as needed.
""" """
nodes = self.iter_nodes(part, ring.get_part_nodes(part), ring) nodes = self.iter_nodes(part, ring.get_part_nodes(part), ring)
with ContextPool(ring.replica_count) as pool: pile = GreenPile(ring.replica_count)
pile = GreenPile(pool) for head in headers:
for head in headers: pile.spawn(self._make_request, nodes, part, method, path,
pile.spawn(self._make_request, nodes, part, method, path, head, query_string)
head, query_string) response = [resp for resp in pile if resp]
response = [resp for resp in pile if resp]
while len(response) < ring.replica_count: while len(response) < ring.replica_count:
response.append((503, '', '')) response.append((503, '', ''))
statuses, reasons, bodies = zip(*response) statuses, reasons, bodies = zip(*response)
@@ -1290,7 +1289,7 @@ class ContainerController(Controller):
class AccountController(Controller): class AccountController(Controller):
"""WSGI controller for account requests""" """WSGI controller for account requests"""
server_type = _('Container') server_type = _('Account')
def __init__(self, app, account_name, **kwargs): def __init__(self, app, account_name, **kwargs):
Controller.__init__(self, app) Controller.__init__(self, app)