diff options
| -rw-r--r-- | src/rgw/rgw_bucket.cc | 16 | ||||
| -rw-r--r-- | src/rgw/rgw_rados.cc | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index 2f05264778e..99de568d92a 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -863,11 +863,16 @@ int RGWBucketAdminOp::info(RGWRados *store, RGWBucketAdminOpState& op_state, RGWFormatterFlusher& flusher) { RGWBucket bucket; - int ret = bucket.init(store, op_state); - if (ret < 0) - return ret; + int ret; + string bucket_name = op_state.get_bucket_name(); + if (!bucket_name.empty()) { + ret = bucket.init(store, op_state); + if (ret < 0) + return ret; + } + Formatter *formatter = flusher.get_formatter(); flusher.start(0); @@ -911,7 +916,8 @@ int RGWBucketAdminOp::info(RGWRados *store, RGWBucketAdminOpState& op_state, } else { RGWAccessHandle handle; - if (store->list_buckets_init(&handle) > 0) { + formatter->open_array_section("buckets"); + if (store->list_buckets_init(&handle) >= 0) { RGWObjEnt obj; while (store->list_buckets_next(obj, &handle) >= 0) { formatter->dump_string("bucket", obj.name); @@ -919,6 +925,8 @@ int RGWBucketAdminOp::info(RGWRados *store, RGWBucketAdminOpState& op_state, bucket_stats(store, obj.name, formatter); } } + + formatter->close_section(); } flusher.flush(); diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 7d038639a74..5ca27a06a03 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -428,9 +428,7 @@ int RGWRados::list_buckets_next(RGWObjEnt& obj, RGWAccessHandle *handle) obj.name = (*state)->first; (*state)++; - } while (obj.name[0] == '.'); - - /* FIXME: should read mtime/size vals for bucket */ + } while (obj.name[0] == '.'); /* skip all entries starting with '.' */ return 0; } |