Merge pull request #15256 from fangyuxiangGL/bucket-stats

rgw: display more info when using  radosgw-admin bucket stats

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2017-05-26 10:48:41 -04:00 committed by GitHub
commit 4603e97183
2 changed files with 5 additions and 1 deletions

View File

@ -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;

View File

@ -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;