]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix bilog processing of SYNCSTOP entries
authorCasey Bodley <cbodley@redhat.com>
Wed, 5 Feb 2020 17:50:54 +0000 (12:50 -0500)
committerCasey Bodley <cbodley@redhat.com>
Wed, 5 Feb 2020 17:56:18 +0000 (12:56 -0500)
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>
src/rgw/rgw_data_sync.cc

index a419e3d06593a2357abec7c550bac59e8cf6e877..dddb0c6cecbda2c35233819fc3ab3d35189688e4 100644 (file)
@@ -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) {