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: v13.2.2~92^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7d1687cd8c0c2dd5af546900e3788ff4a1a82d9d;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)
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index 26f416e28c8..09e8c94e044 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -3009,7 +3009,7 @@ int RGWBucketShardIncrementalSyncCR::operate()
           set_status() << "squashed operation, skipping";
           tn->log(20, SSTR("skipping object: "
               << bucket_shard_str{bs} << "/" << key << ": squashed operation"));
-          /* not updating high marker though */
+          marker_tracker.try_update_high_marker(cur_id, 0, entry->timestamp);
           continue;
         }
         tn->set_flag(RGW_SNS_FLAG_ACTIVE);