From: Adam C. Emerson <aemerson@redhat.com>
Date: Fri, 10 Sep 2021 16:28:28 +0000 (-0400)
Subject: rgw: RGWCollectBucketSyncStatusCR doesn't need the shard count
X-Git-Tag: v18.0.0~787^2~73
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d50acd9296374522ed6581ea38ff20a69198ead0;p=ceph.git

rgw: RGWCollectBucketSyncStatusCR doesn't need the shard count

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 fc2b8ba1d42..b225d2e7b0a 100644
--- a/src/rgw/rgw_data_sync.cc
+++ b/src/rgw/rgw_data_sync.cc
@@ -5718,7 +5718,9 @@ class RGWCollectBucketSyncStatusCR : public RGWShardCollectCR {
       store(store), sc(sc), env(sc->env), gen(gen),
       i(status->begin()), end(status->end())
   {
-    sync_pair.source_bs = rgw_bucket_shard(source_bucket_info.bucket, source_bucket_info.layout.current_index.layout.normal.num_shards > 0 ? 0 : -1);
+    // This function doesn't need to know the remote shard count, but
+    // callers of read_bucket_inc_sync_status do
+    sync_pair.source_bs = rgw_bucket_shard(source_bucket_info.bucket, 0);
     sync_pair.dest_bucket = dest_bucket_info.bucket;
   }