]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: `RGWSyncBucketCR` reads remote info on non-`Incremental` state
authorAdam C. Emerson <aemerson@redhat.com>
Tue, 17 May 2022 03:26:48 +0000 (23:26 -0400)
committerCasey Bodley <cbodley@redhat.com>
Fri, 27 May 2022 19:47:34 +0000 (15:47 -0400)
This ensures that the remote bucket index log info is available for
all cases where we're calling `InitBucketFullSyncStatusCR`

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/rgw/rgw_data_sync.cc

index 2794d80c2e4b5ec112ae207129bd0c47fc47d2ed..ecc7a9596ae82d128d54246c61a8dc69c9c3c031 100644 (file)
@@ -5159,8 +5159,7 @@ int RGWSyncBucketCR::operate(const DoutPrefixProvider *dpp)
       tn->log(20, SSTR("sync status for source bucket: " << bucket_status.state << 
             ". lease is: " << (bucket_lease_cr ? "taken" : "not taken") << ". stop indications is: " << bucket_stopped));
 
-      if (bucket_status.state == BucketSyncState::Init || 
-          bucket_status.state == BucketSyncState::Stopped ||
+      if (bucket_status.state != BucketSyncState::Incremental ||
           bucket_stopped) { 
         // if state is Init or Stopped, we query the remote RGW for ther state
         yield call(new RGWReadRemoteBucketIndexLogInfoCR(sc, sync_pair.dest_bucket, &info));