From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 6 Oct 2020 21:59:31 +0000 (-0400)
Subject: rgw: InitBucketShardSyncStatus always sets state to Incremental
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e7b02127249efd4218d043e50cb86edf3ea3d52d;p=ceph.git

rgw: InitBucketShardSyncStatus always sets state to Incremental

full sync happens as the bucket level, so the shards will always start
in StateIncrementalSync

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 bdedc70ee0635..fd19179021d77 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -2782,17 +2782,11 @@ public:
         } else {
           // whether or not to do full sync, incremental sync will follow anyway
           if (sync_env->sync_module->should_full_sync()) {
-            status.state = rgw_bucket_shard_sync_info::StateFullSync;
             status.inc_marker.position = info.max_marker;
-          } else {
-            // clear the marker position unless we're resuming from SYNCSTOP
-            if (!stopped) {
-              status.inc_marker.position = "";
-            }
-            status.state = rgw_bucket_shard_sync_info::StateIncrementalSync;
           }
           write_status = true;
           status.inc_marker.timestamp = ceph::real_clock::now();
+          status.state = rgw_bucket_shard_sync_info::StateIncrementalSync;
         }
 
         if (write_status) {