From ba87abf6d1ef3cb88fccbaf62514e5b925fd3408 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 20 Jan 2015 14:17:16 -0500 Subject: [PATCH] worker will now use the new get_worker_bound values Signed-off-by: Alfredo Deza --- radosgw_agent/worker.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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, -- 2.47.3