openstack/swift
Code Issues Proposed changes

Merge "Refactor a quorum-size calculation"

Browse Source
This commit is contained in:
Jenkins 2014-02-24 18:18:16 +00:00 committed by Gerrit Code Review
commit 37279c6f3e
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swift/container/updater.py
View File

@ -31,7 +31,7 @@ from swift.common.bufferedhttp import http_connect
from swift.common.exceptions import ConnectionTimeout from swift.common.exceptions import ConnectionTimeout
from swift.common.ring import Ring from swift.common.ring import Ring
from swift.common.utils import get_logger, config_true_value, ismount, \ 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.daemon import Daemon
from swift.common.http import is_success, HTTP_INTERNAL_SERVER_ERROR from swift.common.http import is_success, HTTP_INTERNAL_SERVER_ERROR
@ -225,13 +225,10 @@ class ContainerUpdater(Daemon):
info['object_count'], info['bytes_used']) info['object_count'], info['bytes_used'])
for node in nodes] for node in nodes]
successes = 0 successes = 0
failures = 0
for event in events: for event in events:
if is_success(event.wait()): if is_success(event.wait()):
successes += 1 successes += 1
else: if successes >= quorum_size(len(events)):
failures += 1
if successes > failures:
self.logger.increment('successes') self.logger.increment('successes')
self.successes += 1 self.successes += 1
self.logger.debug( self.logger.debug(