]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
radosgw-admin: don't duplicate bucket name in bucket_id
authorCasey Bodley <cbodley@redhat.com>
Tue, 19 Oct 2021 17:06:42 +0000 (13:06 -0400)
committerCasey Bodley <cbodley@redhat.com>
Wed, 20 Oct 2021 15:21:39 +0000 (11:21 -0400)
Fixes: https://tracker.ceph.com/issues/52976
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/rgw/rgw_admin.cc

index 295ae5a2430e246f144f03d05c76be388d3bfe5a..e0c18efef6da63cac91520da2f1c46b3dc893bfd 100644 (file)
@@ -1145,12 +1145,7 @@ static int init_bucket(rgw::sal::User* user,
                       const string& bucket_id,
                        std::unique_ptr<rgw::sal::Bucket>* bucket)
 {
-  rgw_bucket b;
-  b.tenant = tenant_name;
-  b.name = bucket_name;
-  if (!bucket_id.empty()) {
-    b.bucket_id = bucket_name + ":" + bucket_id;
-  }
+  rgw_bucket b{tenant_name, bucket_name, bucket_id};
   return init_bucket(user, b, bucket);
 }