From cb16bb3b46a0d7a8aac4eaeada212a9564039d7e Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 2 Apr 2015 12:28:57 -0700 Subject: [PATCH] sync-tool: fix Zone class Signed-off-by: Yehuda Sadeh --- radosgw_agent/sync_tool.py | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/radosgw_agent/sync_tool.py b/radosgw_agent/sync_tool.py index eab1a64..353b137 100644 --- a/radosgw_agent/sync_tool.py +++ b/radosgw_agent/sync_tool.py @@ -718,36 +718,6 @@ class Object(object): print dump_json(entries) -class Zone: - def __init__(self, sync): - self.sync = sync - - def iterate_diff(self, src_buckets): - for b in src_buckets: - buck = Bucket(b, -1, self.sync) - - markers = buck.get_source_markers() - - for (shard_id, instance) in buck.iterate_shards(): - try: - bound = buck.get_bound(instance)['marker'] - except: - bound = None - - try: - marker = markers[shard_id] - except: - marker = None - - if markers[shard_id] != bound: - yield b, shard_id, marker, bound - - def iterate_diff_objects(self, bucket, shard_id, marker, bound): - if not bound: - for obj in client.list_objects_in_bucket(self.sync.src_conn, bucket, shard_id=shard_id): - yield obj - - class Zone(object): def __init__(self, sync): @@ -813,6 +783,11 @@ class Zone(object): if len(gens) < concurrent_buckets: break + def iterate_diff_objects(self, bucket, shard_id, marker, bound): + if not bound: + for obj in client.list_objects_in_bucket(self.sync.src_conn, bucket, shard_id=shard_id): + yield obj + class SyncToolCommand(object): -- 2.47.3