From: fang yuxiang <fang.yuxiang@eisoo.com>
Date: Tue, 11 Apr 2017 09:59:40 +0000 (+0800)
Subject: rgw: bucket stats display bucket index type
X-Git-Tag: v12.0.2~54^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=dcaaea5dc896b0ef74f8ce5a469b0ffef12e516d;p=ceph-ci.git

rgw: bucket stats display bucket index type

Signed-off-by: fang yuxiang fang.yuxiang@eisoo.com
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index de1b3b62bf2..0a13627aa1c 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 8b2bc5f46df..84d3445a42e 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 6b20d01cc8e..c493e9a3e8c 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 {