]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: let radosgw-admin bucket stats return a standard josn 7029/head
authorRuifeng Yang <yangruifeng.09209@h3c.com>
Thu, 24 Dec 2015 04:31:43 +0000 (12:31 +0800)
committerRuifeng Yang <yangruifeng.09209@h3c.com>
Thu, 24 Dec 2015 04:32:12 +0000 (12:32 +0800)
Signed-off-by: Ruifeng Yang <yangruifeng.09209@h3c.com>
src/rgw/rgw_bucket.cc

index f4a245f536cbf50973f74a047f7086032c86186b..0a334ff5af40d8d89e02c351de61303648f5d6d2 100644 (file)
@@ -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);
       }
     }