sync: define manager for the single bucket case

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/radosgw_agent/sync_tool.py b/radosgw_agent/sync_tool.py
index 1267837826e8f572c380e71429da938970e787c5..d1bbd8d57a2a698594ae25674c5d945dc37b0871 100644 (file)
--- a/radosgw_agent/sync_tool.py
+++ b/radosgw_agent/sync_tool.py
@@ -783,7 +783,7 @@ class ZoneFullSyncState(object):
         return hash_val % self.num_shards
 
 
-    def iterate_full_sync_buckets(self):
+    def iterate_buckets(self):
         for shard_id in xrange(self.num_shards):
             info = client.list_worker_bound(self.sync.dest_conn, 'zone.full_data_sync', shard_id)
             if info is not None:
@@ -791,6 +791,14 @@ class ZoneFullSyncState(object):
                     yield k
 
 
+class SingleBucketSyncManager(object):
+    def __init__(self, bucket_name):
+        self.bucket_name = bucket_name
+
+    def iterate_buckets(self):
+        yield self.bucket_name
+
+
 
 class BucketsIterator(object):
     def __init__(self, sync, zone, bucket_name):
@@ -822,6 +830,8 @@ class BucketsIterator(object):
                 log.info('adding bucket to full sync work: {b}'.format(b=bucket_name))
 
     def iterate_dirty_buckets(self):
+        manager =  None
+
         if not self.explicit_bucket:
             cur_state = self.fs_state['state']
             if cur_state == 'init':
@@ -830,13 +840,14 @@ class BucketsIterator(object):
                 cur_state = 'full-sync'
 
             if cur_state == 'full-sync':
-                src_buckets = self.fs_state_manager.iterate_full_sync_buckets()
+                manager = self.fs_state_manager
             else:
+                # incremental sync goes here
                 assert False
         else:
-            src_buckets = [self.bucket_name]
+            manager = SingleBucketSyncManager(self.bucket_name)
 
-        for b in src_buckets:
+        for b in manager.iterate_buckets():
             print 'bucket=', b
             try:
                 buck = Bucket(b, -1, self.sync)
@@ -862,29 +873,24 @@ class BucketsIterator(object):
                     # an empty bucket
                     continue
 
-                if marker != bound:
+                if marker != bound: # need to sync!
                     yield BucketState(buck, shard, marker, bound)
 
 class Zone(object):
     def __init__(self, sync):
         self.sync = sync
 
-    def iterate_diff(self, bi):
-        for bs in bi.iterate_dirty_buckets():
-            yield bs
-
     def sync_data(self, bi, restart):
         gens = {}
 
         if restart:
             bi.fs_state_manager.set_state('init')
 
-
         objs_per_bucket = 10
         concurrent_buckets = 2
 
         while True:
-            for bs in self.iterate_diff(bi):
+            for bs in bi.iterate_dirty_buckets():
                 bucket = bs.bucket
                 shard = bs.shard
                 marker = bs.marker