]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: InitBucketShardSyncStatus always sets state to Incremental
authorCasey Bodley <cbodley@redhat.com>
Tue, 6 Oct 2020 21:59:31 +0000 (17:59 -0400)
committerCasey Bodley <cbodley@redhat.com>
Thu, 4 Feb 2021 21:11:30 +0000 (16:11 -0500)
full sync happens as the bucket level, so the shards will always start
in StateIncrementalSync

Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/rgw/rgw_data_sync.cc

index 1537b6cad1288051584617950d604dc17f2865db..83b434a2721992398f67cb0b14fb625ba7b7ff91 100644 (file)
@@ -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) {