From b99562f2d87a8dab0cb34c4ac11edb2652bbb909 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 5 Jun 2018 09:16:10 -0400 Subject: [PATCH] rgw: bucket sync updates high marker for squashed entries Signed-off-by: Casey Bodley (cherry picked from commit 918fc3813c8d8c96c7c071645b5ae5c1090a7c15) Conflicts: src/rgw/rgw_data_sync.cc - trivial resolution --- 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 4bbbcd9b379..5eee7fd9157 100644 --- a/src/rgw/rgw_data_sync.cc +++ b/src/rgw/rgw_data_sync.cc @@ -2850,7 +2850,7 @@ int RGWBucketShardIncrementalSyncCR::operate() set_status() << "squashed operation, skipping"; ldout(sync_env->cct, 20) << "[inc sync] skipping object: " << bucket_shard_str{bs} << "/" << key << ": squashed operation" << dendl; - /* not updating high marker though */ + marker_tracker.try_update_high_marker(cur_id, 0, entry->timestamp); continue; } ldout(sync_env->cct, 20) << "[inc sync] syncing object: " -- 2.47.3