From: Alfredo Deza <adeza@redhat.com>
Date: Tue, 20 Jan 2015 19:17:16 +0000 (-0500)
Subject: worker will now use the new get_worker_bound values
X-Git-Tag: v1.2.1~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F20%2Fhead;p=radosgw-agent.git

worker will now use the new get_worker_bound values

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/radosgw_agent/worker.py b/radosgw_agent/worker.py
index 8731f50..9e9eec8 100644
--- a/radosgw_agent/worker.py
+++ b/radosgw_agent/worker.py
@@ -311,15 +311,15 @@ class DataWorkerIncremental(IncrementalMixin, DataWorker):
 
         new_retries = []
         for bucket_instance in bucket_instances.union(retries):
-            try:
-                marker, timestamp, retries = client.get_worker_bound(
-                    self.dest_conn,
-                    'bucket-index',
-                    bucket_instance)
-            except NotFound:
-                log.debug('no worker bound found for bucket instance "%s"',
-                          bucket_instance)
-                marker, timestamp, retries = ' ', DEFAULT_TIME, []
+            bound = client.get_worker_bound(
+                self.dest_conn,
+                'bucket-index',
+                bucket_instance)
+
+            marker = bound['marker']
+            retries = bound['retries']
+            timestamp = bound['oldest_time']
+
             try:
                 sync_result = self.inc_sync_bucket_instance(bucket_instance,
                                                             marker,