rgw: RunBucketSourceSync uses num_shards from remote bilog info

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/rgw/rgw_data_sync.cc b/src/rgw/rgw_data_sync.cc
index dd8bb6d762196dd2613b2114c67c4bfe40009998..fc2b8ba1d42b3688c785868810263fb9592f93f1 100644 (file)
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -841,8 +841,8 @@ class RGWReadRemoteBucketIndexLogInfoCR : public RGWCoroutine {
 
 public:
   RGWReadRemoteBucketIndexLogInfoCR(RGWDataSyncCtx *_sc,
-                                  const rgw_bucket& bucket,
-                                  rgw_bucket_index_marker_info *_info)
+                                   const rgw_bucket& bucket,
+                                   rgw_bucket_index_marker_info *_info)
     : RGWCoroutine(_sc->cct), sc(_sc), sync_env(_sc->env),
       instance_key(bucket.get_key()), info(_info) {}
 
@@ -1278,6 +1278,8 @@ class RGWRunBucketSourcesSyncCR : public RGWCoroutine {
   int cur_shard{0};
   bool again = false;
   std::optional<uint64_t> gen;
+  rgw_bucket_index_marker_info marker_info;
+  BucketIndexShardsManager marker_mgr;
 
 public:
   RGWRunBucketSourcesSyncCR(RGWDataSyncCtx *_sc,
@@ -4758,8 +4760,21 @@ int RGWRunBucketSourcesSyncCR::operate(const DoutPrefixProvider *dpp)
     for (siter = pipes.begin(); siter != pipes.end(); ++siter) {
       {
         ldpp_dout(dpp, 20) << __func__ << "(): sync pipe=" << *siter << dendl;
+       yield call(new RGWReadRemoteBucketIndexLogInfoCR(
+                    sc, siter->source.get_bucket_info().bucket, &marker_info));
+       if (retcode < 0) {
+         tn->log(0, SSTR("ERROR: failed to fetch markers for bucket: "
+                         << siter->source.get_bucket_info().bucket));
+         return set_cr_error(retcode);
+       }
+       retcode = marker_mgr.from_string(marker_info.max_marker, -1);
+       if (retcode < 0) {
+         ldpp_dout(dpp, 0) << "ERROR: failed to decode markers for bucket: "
+                           << siter->source.get_bucket_info().bucket << dendl;
+         return set_cr_error(retcode);
+       }
+       source_num_shards = marker_mgr.get().size();
 
-        source_num_shards = siter->source.get_bucket_info().layout.current_index.layout.normal.num_shards;
        target_num_shards = siter->target.get_bucket_info().layout.current_index.layout.normal.num_shards;
         if (source_bs) {
           sync_pair.source_bs = *source_bs;