From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 5 Jun 2018 13:16:10 +0000 (-0400)
Subject: rgw: bucket sync updates high marker for squashed entries
X-Git-Tag: v12.2.9~85^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b99562f2d87a8dab0cb34c4ac11edb2652bbb909;p=ceph.git

rgw: bucket sync updates high marker for squashed entries

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 918fc3813c8d8c96c7c071645b5ae5c1090a7c15)

Conflicts:
	src/rgw/rgw_data_sync.cc
- trivial resolution
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 4bbbcd9b379d..5eee7fd91574 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: "