From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 5 Feb 2020 17:50:54 +0000 (-0500)
Subject: rgw: fix bilog processing of SYNCSTOP entries
X-Git-Tag: v15.1.1~473^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=161ea6edb6f8215a8833c709b4aad2c5f3eeffc6;p=ceph.git

rgw: fix bilog processing of SYNCSTOP entries

when BucketShardIncrementalSync encounters SYNCSTOP, it needs to call
try_update_high_marker() to advance past its marker. for sync modules
that don't support full sync, this allows them to resume incremental
sync from this position in the log when sync is reenabled

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index a419e3d06593..dddb0c6cecbd 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -3900,7 +3900,7 @@ int RGWBucketShardIncrementalSyncCR::operate()
         if (e.op == RGWModifyOp::CLS_RGW_OP_SYNCSTOP) {
           ldout(sync_env->cct, 20) << "syncstop on " << e.timestamp << dendl;
           syncstopped = true;
-          entries_end = entries_iter; // dont sync past here
+          entries_end = std::next(entries_iter); // stop after this entry
           break;
         }
         if (e.op == RGWModifyOp::CLS_RGW_OP_RESYNC) {