From 54490be07977d1516a41ca637252e9f7c799ef95 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Tue, 17 Mar 2015 11:03:39 -0400 Subject: [PATCH] use the new utility to slap extra metadata to retries Signed-off-by: Alfredo Deza --- radosgw_agent/worker.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/radosgw_agent/worker.py b/radosgw_agent/worker.py index 917e8f6..4d01cc9 100644 --- a/radosgw_agent/worker.py +++ b/radosgw_agent/worker.py @@ -8,6 +8,7 @@ import time from radosgw_agent import client from radosgw_agent import lock +from radosgw_agent.util import obj from radosgw_agent.exceptions import SkipShard, SyncError, SyncTimedOut, SyncFailed, NotFound, BucketEmpty from radosgw_agent.constants import DEFAULT_TIME, RESULT_SUCCESS, RESULT_ERROR @@ -73,7 +74,9 @@ class Worker(multiprocessing.Process): if type_ is None: type_ = self.type try: - data = [dict(name=item, time=DEFAULT_TIME) for item in retries] + data = [ + obj.to_dict(item, time=DEFAULT_TIME) for item in retries + ] client.set_worker_bound(self.dest_conn, type_, marker, @@ -302,7 +305,7 @@ class DataWorker(Worker): except SyncError as err: log.error('failed to sync object %s/%s: %s', bucket, obj.name, err) - retry_objs.append(obj.name) + retry_objs.append(obj) log.debug('bucket {bucket} has {num_objects} object'.format( bucket=bucket, num_objects=count)) -- 2.47.3