From 6f92fc86d66fbe71aff27d36646eba2c389f58c8 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 6 Oct 2020 17:59:31 -0400 Subject: [PATCH] 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 --- src/rgw/rgw_data_sync.cc | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc index 1537b6cad1288..83b434a272199 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) { -- 2.39.5