From 4720662d0fb1966fcd33bfa7b79841d4a947fbfd Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 3 Dec 2015 11:02:44 -0800 Subject: [PATCH] rgw: update bucket index marker before skipping entries Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_data_sync.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc index 5701af8ba0903..3d09d25eb2098 100644 --- a/src/rgw/rgw_data_sync.cc +++ b/src/rgw/rgw_data_sync.cc @@ -2092,6 +2092,7 @@ int RGWBucketShardIncrementalSyncCR::operate() key = rgw_obj_key(entries_iter->object, entries_iter->instance); entry = &(*entries_iter); set_status() << "got entry.id=" << entry->id << " key=" << key << " op=" << (int)entry->op; + inc_marker.position = entry->id; if (entry->op == CLS_RGW_OP_CANCEL) { set_status() << "canceled operation, skipping"; ldout(store->ctx(), 20) << "[inc sync] skipping object: " << bucket_name << ":" << bucket_id << ":" << shard_id << "/" << key << ": canceled operation" << dendl; @@ -2103,7 +2104,6 @@ int RGWBucketShardIncrementalSyncCR::operate() continue; } ldout(store->ctx(), 20) << "[inc sync] syncing object: " << bucket_name << ":" << bucket_id << ":" << shard_id << "/" << key << dendl; - inc_marker.position = entry->id; updated_status = false; while (!marker_tracker->can_do_op(key, entry->op)) { if (!updated_status) { -- 2.39.5