From dcaaea5dc896b0ef74f8ce5a469b0ffef12e516d Mon Sep 17 00:00:00 2001 From: fang yuxiang Date: Tue, 11 Apr 2017 17:59:40 +0800 Subject: [PATCH] rgw: bucket stats display bucket index type Signed-off-by: fang yuxiang fang.yuxiang@eisoo.com --- src/rgw/rgw_admin.cc | 1 + src/rgw/rgw_bucket.cc | 1 + src/rgw/rgw_common.h | 12 ++++++++++++ 3 files changed, 14 insertions(+) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index de1b3b62bf2a3..0a13627aa1c43 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -1024,6 +1024,7 @@ int bucket_stats(rgw_bucket& bucket, int shard_id, Formatter *formatter) formatter->dump_string("id", bucket.bucket_id); formatter->dump_string("marker", bucket.marker); + formatter->dump_stream("index_type") << bucket_info.index_type; ::encode_json("owner", bucket_info.owner, formatter); formatter->dump_int("mtime", utime_t(mtime)); formatter->dump_string("ver", bucket_ver); diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index 8b2bc5f46df16..84d3445a42e55 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -1386,6 +1386,7 @@ static int bucket_stats(RGWRados *store, const std::string& tenant_name, std::st formatter->dump_string("bucket", bucket.name); formatter->dump_string("id", bucket.bucket_id); formatter->dump_string("marker", bucket.marker); + formatter->dump_stream("index_type") << bucket_info.index_type; ::encode_json("owner", bucket_info.owner, formatter); formatter->dump_string("ver", bucket_ver); formatter->dump_string("master_ver", master_ver); diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h index 6b20d01cc8ea9..c493e9a3e8c15 100644 --- a/src/rgw/rgw_common.h +++ b/src/rgw/rgw_common.h @@ -1102,6 +1102,18 @@ enum RGWBucketIndexType { RGWBIType_Indexless = 1, }; +inline ostream& operator<<(ostream& out, const RGWBucketIndexType &index_type) +{ + switch (index_type) { + case RGWBIType_Normal: + return out << "Normal"; + case RGWBIType_Indexless: + return out << "Indexless"; + default: + return out << "Unknown"; + } +} + struct RGWBucketInfo { enum BIShardsHashType { -- 2.39.5