From: Volker Theile Date: Wed, 22 May 2019 09:20:49 +0000 (+0200) Subject: rgw: Return tenant field in bucket_stats function X-Git-Tag: v13.2.7~286^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f13989f5d348c423459c80d40266fb8a97065a1e;p=ceph.git rgw: Return tenant field in bucket_stats function Fixes: tracker.ceph.com/issues/36681 Signed-off-by: Volker Theile (cherry picked from commit 9440776f0625451a535d87749d65c8835a76e261) --- diff --git a/qa/tasks/radosgw_admin_rest.py b/qa/tasks/radosgw_admin_rest.py index 99a742f13b9..42a37ba98d4 100644 --- a/qa/tasks/radosgw_admin_rest.py +++ b/qa/tasks/radosgw_admin_rest.py @@ -404,6 +404,7 @@ def task(ctx, config): assert ret == 200 assert out['owner'] == user1 + assert out['tenant'] == '' bucket_id = out['id'] # TESTCASE 'bucket-stats4','bucket','stats','new empty bucket','succeeds, expected bucket ID' diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index 45859827124..9fc88a9bf20 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -1432,6 +1432,7 @@ static int bucket_stats(RGWRados *store, const std::string& tenant_name, std::st formatter->open_object_section("stats"); formatter->dump_string("bucket", bucket.name); + formatter->dump_string("tenant", bucket.tenant); formatter->dump_string("zonegroup", bucket_info.zonegroup); formatter->dump_string("placement_rule", bucket_info.placement_rule); ::encode_json("explicit_placement", bucket.explicit_placement, formatter);