From f42cb54002eaaa1f82a7a489802afc85412e2ce1 Mon Sep 17 00:00:00 2001 From: Samuel Merritt Date: Fri, 21 Feb 2014 16:49:22 -0800 Subject: [PATCH] Refactor a quorum-size calculation No behavior change, just use the utility function instead of rolling our own. Change-Id: I152ccd8f22f424cd7547fa4d67df020f263096a9 --- swift/container/updater.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/swift/container/updater.py b/swift/container/updater.py index 4c8d8f7709..2c2e74660f 100644 --- a/swift/container/updater.py +++ b/swift/container/updater.py @@ -31,7 +31,7 @@ from swift.common.bufferedhttp import http_connect from swift.common.exceptions import ConnectionTimeout from swift.common.ring import Ring from swift.common.utils import get_logger, config_true_value, ismount, \ - dump_recon_cache + dump_recon_cache, quorum_size from swift.common.daemon import Daemon from swift.common.http import is_success, HTTP_INTERNAL_SERVER_ERROR @@ -225,13 +225,10 @@ class ContainerUpdater(Daemon): info['object_count'], info['bytes_used']) for node in nodes] successes = 0 - failures = 0 for event in events: if is_success(event.wait()): successes += 1 - else: - failures += 1 - if successes > failures: + if successes >= quorum_size(len(events)): self.logger.increment('successes') self.successes += 1 self.logger.debug(