Skip to content

Instantly share code, notes, and snippets.

@smerritt
Created April 14, 2015 02:40
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save smerritt/ceacbc30d29772b52e51 to your computer and use it in GitHub Desktop.
Save smerritt/ceacbc30d29772b52e51 to your computer and use it in GitHub Desktop.
diff --git a/swift/proxy/controllers/obj.py b/swift/proxy/controllers/obj.py
index 1eca761..f445ce5 100644
--- a/swift/proxy/controllers/obj.py
+++ b/swift/proxy/controllers/obj.py
@@ -2147,21 +2147,8 @@ class ECObjectController(BaseObjectController):
for (putter, response) in pile:
if response:
_handle_response(putter, response)
- if need_quorum and final_phase:
- # check quorum only when this is the final phase of a
- # multiphase PUT. In case of intermediate phase of a
- # multiphase PUT, we should wait until we have collected
- # enough 100-continue responses, before starting the
- # next phase.
- if self.have_quorum(statuses, num_nodes):
- quorum = True
- break
- else:
- # if quorum is not required (final phase of an erasure
- # coded PUT, for example), respond to the client after
- # receiving 'min_responses' as specified by the caller
- if self._have_adequate_successes(statuses, min_responses):
- break
+ if self._have_adequate_successes(statuses, min_responses):
+ break
else:
putter.failed = True
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment