From: Ruifeng Yang <yangruifeng.09209@h3c.com>
Date: Thu, 24 Dec 2015 04:31:43 +0000 (+0800)
Subject: rgw: let radosgw-admin bucket stats return a standard josn
X-Git-Tag: v10.0.3~76^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c615feb7bbace5334372bf35f7e95ae17bd66c64;p=ceph.git

rgw: let radosgw-admin bucket stats return a standard josn

Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
---

diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc
index f4a245f536cb..0a334ff5af40 100644
--- a/src/rgw/rgw_bucket.cc
+++ b/src/rgw/rgw_bucket.cc
@@ -1157,9 +1157,10 @@ int RGWBucketAdminOp::info(RGWRados *store, RGWBucketAdminOpState& op_state,
     if (store->list_buckets_init(&handle) >= 0) {
       RGWObjEnt obj;
       while (store->list_buckets_next(obj, &handle) >= 0) {
-	formatter->dump_string("bucket", obj.key.name);
         if (show_stats)
           bucket_stats(store, user_id.tenant, obj.key.name, formatter);
+        else
+          formatter->dump_string("bucket", obj.key.name);
       }
     }