From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 25 Apr 2017 19:32:26 +0000 (-0400)
Subject: test/rgw: sync status ignores shard markers from previous periods
X-Git-Tag: v12.0.3~225^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d6e7fae93eba5eefeea1c0ec1e1d46a1067cf74;p=ceph.git

test/rgw: sync status ignores shard markers from previous periods

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py
index 4812df5ae60..beacdc88cad 100644
--- a/src/test/rgw/rgw_multi/tests.py
+++ b/src/test/rgw/rgw_multi/tests.py
@@ -76,7 +76,14 @@ def meta_sync_status(zone):
     log.debug('sync_markers=%s', sync_markers)
     assert(num_shards == len(sync_markers))
 
-    markers = {i: m['val']['marker'] for i, m in enumerate(sync_markers)}
+    markers={}
+    for i in range(num_shards):
+        # get marker, only if it's an incremental marker for the same realm epoch
+        if realm_epoch > sync_markers[i]['val']['realm_epoch'] or sync_markers[i]['val']['state'] == 0:
+            markers[i] = ''
+        else:
+            markers[i] = sync_markers[i]['val']['marker']
+
     return period, realm_epoch, num_shards, markers
 
 def meta_master_log_status(master_zone):