From 5d6e7fae93eba5eefeea1c0ec1e1d46a1067cf74 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 25 Apr 2017 15:32:26 -0400 Subject: [PATCH] test/rgw: sync status ignores shard markers from previous periods Signed-off-by: Casey Bodley --- src/test/rgw/rgw_multi/tests.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py index 4812df5ae60c4..beacdc88cad07 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): -- 2.39.5