From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 6 May 2016 22:32:50 +0000 (-0700)
Subject: test/rgw: fix bucket checkpoint
X-Git-Tag: v11.0.0~625^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F8981%2Fhead;p=ceph.git

test/rgw: fix bucket checkpoint

Can refer to the incremental sync marker only if bucket is in the incremental
sync state.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/test/rgw/test_multi.py b/src/test/rgw/test_multi.py
index 88626851a65..92b36bd7612 100644
--- a/src/test/rgw/test_multi.py
+++ b/src/test/rgw/test_multi.py
@@ -323,7 +323,10 @@ class RGWRealm:
         markers={}
         for entry in sync_status:
             val = entry['val']
-            pos = val['inc_marker']['position'].split('#')[-1] # get rid of shard id; e.g., 6#00000000002.132.3 -> 00000000002.132.3
+            if val['status'] == 'incremental-sync':
+                pos = val['inc_marker']['position'].split('#')[-1] # get rid of shard id; e.g., 6#00000000002.132.3 -> 00000000002.132.3
+            else:
+                pos = ''
             markers[entry['key']] = pos
 
         return markers