set bounds on the dest zone, not on the source zone

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

diff --git a/radosgw_agent/sync.py b/radosgw_agent/sync.py
index 504143469cc2850c464f4ba21406814b8c4c4ce6..f8838590144a813a7a78416cc319e04588e3b763 100644 (file)
--- a/radosgw_agent/sync.py
+++ b/radosgw_agent/sync.py
@@ -14,6 +14,7 @@ class Syncer:
         self.src = src
         self.dest = dest
         self.src_conn = client.connection(src)
+        self.dest_conn = client.connection(dest)
         self.daemon_id = daemon_id
 
     def sync_partial(self, num_workers, log_lock_time, max_entries):
@@ -141,7 +142,7 @@ class Syncer:
                       len(errors), errors)
         else:
             for shard_num, marker, timestamp in shard_info:
-                client.set_worker_bound(self.src_conn, 'metadata', shard_num,
+                client.set_worker_bound(self.dest_conn, 'metadata', shard_num,
                                         marker, timestamp, self.daemon_id)
-                client.del_worker_bound(self.src_conn, 'metadata', shard_num,
+                client.del_worker_bound(self.dest_conn, 'metadata', shard_num,
                                         self.daemon_id)

diff --git a/radosgw_agent/worker.py b/radosgw_agent/worker.py
index 47e0dd267f4dcb0b01251d745caf75eab91c226d..9d7c77dccb9fe01e2ace59083f19c88e3449629d 100644 (file)
--- a/radosgw_agent/worker.py
+++ b/radosgw_agent/worker.py
@@ -108,7 +108,7 @@ class MetadataWorkerPartial(MetadataWorker):
 
         if entries:
             try:
-                client.set_worker_bound(self.source_conn, 'metadata',
+                client.set_worker_bound(self.dest_conn, 'metadata',
                                         shard_num, entries[-1].marker,
                                         entries[-1].timestamp,
                                         self.daemon_id)
@@ -148,7 +148,7 @@ class MetadataWorkerPartial(MetadataWorker):
 
             result = RESULT_SUCCESS
             try:
-                marker, time = client.get_min_worker_bound(self.source_conn,
+                marker, time = client.get_min_worker_bound(self.dest_conn,
                                                            'metadata',
                                                            shard_num)
                 log.debug('oldest marker and time for shard %d are: %r %r',