From: Josh Durgin <josh.durgin@inktank.com>
Date: Fri, 25 Oct 2013 20:04:14 +0000 (-0700)
Subject: worker: treat 404 as an empty marker
X-Git-Tag: v1.1~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e598ec2ffdb137414c31e049d5c49baef47c836d;p=radosgw-agent.git

worker: treat 404 as an empty marker

If the log does not exist at all, since no operations have been completed
on that bucket, we get a 404.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/radosgw_agent/worker.py b/radosgw_agent/worker.py
index 243ac45..d81f4ea 100644
--- a/radosgw_agent/worker.py
+++ b/radosgw_agent/worker.py
@@ -333,8 +333,11 @@ class DataWorkerFull(DataWorker):
     def full_sync_bucket(self, bucket):
         try:
             instance = self.get_bucket_instance(bucket)
-            marker = client.get_log_info(self.src_conn, 'bucket-index',
-                                         instance)['max_marker']
+            try:
+                marker = client.get_log_info(self.src_conn, 'bucket-index',
+                                             instance)['max_marker']
+            except client.NotFound:
+                marker = ''
             log.debug('bucket instance is "%s" with marker %s', instance, marker)
             # nothing to do for this bucket
             if not marker: