From: Yehuda Sadeh <yehuda@inktank.com>
Date: Sat, 3 Aug 2013 05:20:00 +0000 (-0700)
Subject: set bounds on the dest zone, not on the source zone
X-Git-Tag: v1.1~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=12000bc986c98bd170bea6f161b41d2302c18cee;p=radosgw-agent.git

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 5041434..f883859 100644
--- 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 47e0dd2..9d7c77d 100644
--- 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',