From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 20 Apr 2020 19:23:14 +0000 (-0400)
Subject: rgw: use target bucket layout for reshard
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1460^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6a64fe3e1ada19caa8b422ed4aef73e95a397800;p=ceph-ci.git

rgw: use target bucket layout for reshard

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_reshard.cc b/src/rgw/rgw_reshard.cc
index d1d42fde1c6..5489e5e3e59 100644
--- a/src/rgw/rgw_reshard.cc
+++ b/src/rgw/rgw_reshard.cc
@@ -525,7 +525,6 @@ int RGWBucketReshard::do_reshard(int num_shards,
 				 Formatter *formatter)
 {
   rgw_bucket& bucket = bucket_info.bucket;
-  rgw::bucket_index_normal_layout layout;
 
   int ret = 0;
 
@@ -612,7 +611,7 @@ int RGWBucketReshard::do_reshard(int num_shards,
 	  // place the multipart .meta object on the same shard as its head object
 	  obj.index_hash_source = mp.get_key();
 	}
-	int ret = store->getRados()->get_target_shard_id(layout, obj.get_hash_object(), &target_shard_id);
+	int ret = store->getRados()->get_target_shard_id(new_bucket_info.layout.current_index.layout.normal, obj.get_hash_object(), &target_shard_id);
 	if (ret < 0) {
 	  lderr(store->ctx()) << "ERROR: get_target_shard_id() returned ret=" << ret << dendl;
 	  return ret;