openstack/swift
Code Issues Proposed changes

Merge "Simplify chained comparison"

Browse Source
This commit is contained in:
Jenkins 2016-07-19 03:56:31 +00:00 committed by Gerrit Code Review
commit c69a49a473
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swift/common/db_replicator.py
View File

@ -117,7 +117,6 @@ class ReplConnection(BufferedHTTPConnection):
""" """
def __init__(self, node, partition, hash_, logger): def __init__(self, node, partition, hash_, logger):
""
self.logger = logger self.logger = logger
self.node = node self.node = node
host = "%s:%s" % (node['replication_ip'], node['replication_port']) host = "%s:%s" % (node['replication_ip'], node['replication_port'])
@ -296,7 +295,7 @@ class Replicator(Daemon):
return False return False
with Timeout(replicate_timeout or self.node_timeout): with Timeout(replicate_timeout or self.node_timeout):
response = http.replicate(replicate_method, local_id) response = http.replicate(replicate_method, local_id)
return response and response.status >= 200 and response.status < 300 return response and 200 <= response.status < 300
def _usync_db(self, point, broker, http, remote_id, local_id): def _usync_db(self, point, broker, http, remote_id, local_id):
""" """
@ -342,7 +341,7 @@ class Replicator(Daemon):
else: else:
with Timeout(self.node_timeout): with Timeout(self.node_timeout):
response = http.replicate('merge_syncs', sync_table) response = http.replicate('merge_syncs', sync_table)
if response and response.status >= 200 and response.status < 300: if response and 200 <= response.status < 300:
broker.merge_syncs([{'remote_id': remote_id, broker.merge_syncs([{'remote_id': remote_id,
'sync_point': point}], 'sync_point': point}],
incoming=False) incoming=False)
@ -429,7 +428,7 @@ class Replicator(Daemon):
different_region=different_region) different_region=different_region)
elif response.status == HTTP_INSUFFICIENT_STORAGE: elif response.status == HTTP_INSUFFICIENT_STORAGE:
raise DriveNotMounted() raise DriveNotMounted()
elif response.status >= 200 and response.status < 300: elif 200 <= response.status < 300:
rinfo = json.loads(response.data) rinfo = json.loads(response.data)
local_sync = broker.get_sync(rinfo['id'], incoming=False) local_sync = broker.get_sync(rinfo['id'], incoming=False)
if self._in_sync(rinfo, info, broker, local_sync): if self._in_sync(rinfo, info, broker, local_sync):
@ -507,8 +506,7 @@ class Replicator(Daemon):
# than the put_timestamp, and there are no objects. # than the put_timestamp, and there are no objects.
delete_timestamp = Timestamp(info.get('delete_timestamp') or 0) delete_timestamp = Timestamp(info.get('delete_timestamp') or 0)
put_timestamp = Timestamp(info.get('put_timestamp') or 0) put_timestamp = Timestamp(info.get('put_timestamp') or 0)
if delete_timestamp < (now - self.reclaim_age) and \ if (now - self.reclaim_age) > delete_timestamp > put_timestamp and \
delete_timestamp > put_timestamp and \
info['count'] in (None, '', 0, '0'): info['count'] in (None, '', 0, '0'):
if self.report_up_to_date(info): if self.report_up_to_date(info):
self.delete_db(broker) self.delete_db(broker)