rgw: Return tenant field in bucket_stats function

Fixes: tracker.ceph.com/issues/36681
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 9440776f0625451a535d87749d65c8835a76e261)

diff --git a/qa/tasks/radosgw_admin_rest.py b/qa/tasks/radosgw_admin_rest.py
index 99a742f13b9e18efc2b9bf7d0e38c272227ba925..42a37ba98d485cf3e588c03e5c3d12a5eb927315 100644 (file)
--- 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 45859827124ceea091302b4db0625108f1686c2c..9fc88a9bf202a1e68358d5bb33a208d1f2f3b3dd 100644 (file)
--- 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);