rgw: Return tenant field in bucket_stats function

Fixes: https://tracker.ceph.com/issues/36681
Signed-off-by: Volker Theile <vtheile@suse.com>

diff --git a/qa/tasks/radosgw_admin_rest.py b/qa/tasks/radosgw_admin_rest.py
index 8a4bf3c0feecbecac8b261beab8ca3c6778d764a..28e47e53b7d94c4226004b09b35b1f41b8d4e535 100644 (file)
--- a/qa/tasks/radosgw_admin_rest.py
+++ b/qa/tasks/radosgw_admin_rest.py
@@ -382,6 +382,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 fc44adeac669c577ad4b5c92048e334906415143..006b1d62493f5e6e1ba29bc8ab4bc66c6859b3d0 100644 (file)
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -1420,6 +1420,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);