From 01865a10bcb6b6be8dc14e92cfffb59676405924 Mon Sep 17 00:00:00 2001 From: "fang.yuxiang" Date: Wed, 24 May 2017 13:41:21 +0800 Subject: [PATCH] rgw: display more info when use bucket stats display the zonegroup uuid and placement rule of bucket, when using radosgw-admin bucket stats Signed-off-by: fang yuxiang fang.yuxiang@eisoo.com --- src/rgw/rgw_admin.cc | 3 ++- src/rgw/rgw_bucket.cc | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 69ff573fcde9b..d2cc6e6f04719 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -1037,8 +1037,9 @@ int bucket_stats(rgw_bucket& bucket, int shard_id, Formatter *formatter) } formatter->open_object_section("stats"); formatter->dump_string("bucket", bucket.name); + formatter->dump_string("zonegroup", bucket_info.zonegroup); + formatter->dump_string("placement_rule", bucket_info.placement_rule); ::encode_json("explicit_placement", bucket.explicit_placement, formatter); - formatter->dump_string("id", bucket.bucket_id); formatter->dump_string("marker", bucket.marker); formatter->dump_stream("index_type") << bucket_info.index_type; diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index 24c9dcae5fc37..584ebe9f50fd9 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -1379,6 +1379,9 @@ 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("zonegroup", bucket_info.zonegroup); + formatter->dump_string("placement_rule", bucket_info.placement_rule); + ::encode_json("explicit_placement", bucket.explicit_placement, formatter); formatter->dump_string("id", bucket.bucket_id); formatter->dump_string("marker", bucket.marker); formatter->dump_stream("index_type") << bucket_info.index_type; -- 2.39.5