From: Alfredo Deza Date: Wed, 19 Nov 2014 20:23:04 +0000 (-0500) Subject: by default object is not found, changing only when sync_object_intra_region() works X-Git-Tag: v1.2~5^2~9 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d3edddc4264d2f9acda04bcf8bc22e6395243a2;p=radosgw-agent.git by default object is not found, changing only when sync_object_intra_region() works Signed-off-by: Alfredo Deza --- diff --git a/radosgw_agent/worker.py b/radosgw_agent/worker.py index beb64ee..6c84776 100644 --- a/radosgw_agent/worker.py +++ b/radosgw_agent/worker.py @@ -174,16 +174,16 @@ class DataWorker(Worker): log.debug('sync_object %s/%s', bucket, obj) self.op_id += 1 local_op_id = self.local_lock_id + ':' + str(self.op_id) + found = False try: - found = True until = time.time() + self.object_sync_timeout client.sync_object_intra_region(self.dest_conn, bucket, obj, self.src.zone.name, self.daemon_id, local_op_id) + found = True except client.NotFound: - found = False log.debug('"%s/%s" not found on master, deleting from secondary', bucket, obj) try: