From 13f15e6122f73939a4778bf08adffba45770a7fb Mon Sep 17 00:00:00 2001 From: albIN7 Date: Tue, 2 Jul 2019 11:30:36 +0530 Subject: [PATCH] rgw: fix indentation for listobjectsv2 https://tracker.ceph.com/issues/41840 Signed-off-by: Albin Antony --- src/rgw/rgw_rest_s3.cc | 115 +++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 62 deletions(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index bce2ca9457698..f272ebedcd9f3 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -772,56 +772,51 @@ void RGWGetUsage_ObjStore_S3::send_response() } int RGWListBucket_ObjStore_S3::get_common_params() - { -list_versions = s->info.args.exists("versions"); -prefix = s->info.args.get("prefix"); - -// non-standard -s->info.args.get_bool("allow-unordered", &allow_unordered, false); -delimiter = s->info.args.get("delimiter"); -max_keys = s->info.args.get("max-keys"); -op_ret = parse_max_keys(); -if (op_ret < 0) { - return op_ret; -} + list_versions = s->info.args.exists("versions"); + prefix = s->info.args.get("prefix"); -encoding_type = s->info.args.get("encoding-type"); -if (s->system_request) { - s->info.args.get_bool("objs-container", &objs_container, false); - const char *shard_id_str = s->info.env->get("HTTP_RGWX_SHARD_ID"); - if (shard_id_str) { - string err; - shard_id = strict_strtol(shard_id_str, 10, &err); - if (!err.empty()) { - ldout(s->cct, 5) << "bad shard id specified: " << shard_id_str << dendl; - return -EINVAL; -} -} - else { - shard_id = s->bucket_instance_shard_id; -} -} -return 0; + // non-standard + s->info.args.get_bool("allow-unordered", &allow_unordered, false); + delimiter = s->info.args.get("delimiter"); + max_keys = s->info.args.get("max-keys"); + op_ret = parse_max_keys(); + if (op_ret < 0) { + return op_ret; + } + encoding_type = s->info.args.get("encoding-type"); + if (s->system_request) { + s->info.args.get_bool("objs-container", &objs_container, false); + const char *shard_id_str = s->info.env->get("HTTP_RGWX_SHARD_ID"); + if (shard_id_str) { + string err; + shard_id = strict_strtol(shard_id_str, 10, &err); + if (!err.empty()) { + ldout(s->cct, 5) << "bad shard id specified: " << shard_id_str << dendl; + return -EINVAL; + } + } else { + shard_id = s->bucket_instance_shard_id; + } + } + return 0; } int RGWListBucket_ObjStore_S3::get_params() { -int ret = get_common_params(); -if (ret < 0) { - return ret; -} -if (!list_versions) { - marker = s->info.args.get("marker"); -} -else { - marker.name = s->info.args.get("key-marker"); - marker.instance = s->info.args.get("version-id-marker"); -} -return 0; + int ret = get_common_params(); + if (ret < 0) { + return ret; + } + if (!list_versions) { + marker = s->info.args.get("marker"); + } else { + marker.name = s->info.args.get("key-marker"); + marker.instance = s->info.args.get("version-id-marker"); + } + return 0; } - int RGWListBucket_ObjStore_S3v2::get_params() { int ret = get_common_params(); @@ -829,10 +824,12 @@ if (ret < 0) { return ret; } s->info.args.get_bool("fetch-owner", &fetchOwner, false); -startAfter = s->info.args.get("start-after"); -marker = s->info.args.get("ContinuationToken"); -if(marker.empty()) { +startAfter = s->info.args.get("start-after", &start_after_exist); +continuation_token = s->info.args.get("continuation-token", &continuation_token_exist); +if(!continuation_token_exist) { marker = startAfter; +} else { + marker = continuation_token; } return 0; } @@ -872,8 +869,6 @@ void RGWListBucket_ObjStore_S3::send_common_versioned_response() } } - - void RGWListBucket_ObjStore_S3::send_versioned_response() { s->formatter->open_object_section_in_ns("ListVersionsResult", XMLNS_AWS_S3); @@ -945,13 +940,15 @@ void RGWListBucket_ObjStore_S3::send_versioned_response() } else { s->formatter->dump_string("Type", "Normal"); } - s->formatter->close_section(); + s->formatter->close_section(); // Version/DeleteMarker } - - s->formatter->close_section(); + if (objs_container) { + s->formatter->close_section(); // Entries + } + s->formatter->close_section(); // ListVersionsResult + } rgw_flush_formatter_and_reset(s, s->formatter); } -} void RGWListBucket_ObjStore_S3::send_common_response() @@ -979,12 +976,9 @@ void RGWListBucket_ObjStore_S3::send_common_response() } } - - void RGWListBucket_ObjStore_S3::send_response() { - -if(op_ret < 0) { + if (op_ret < 0) { set_req_state_err(s, op_ret); } dump_errno(s); @@ -1105,7 +1099,7 @@ void RGWListBucket_ObjStore_S3v2::send_versioned_response() auto& storage_class = rgw_placement_rule::get_canonical_storage_class(iter->meta.storage_class); s->formatter->dump_string("StorageClass", storage_class.c_str()); } - if(fetchOwner == true) { + if (fetchOwner == true) { dump_owner(s, s->user->user_id, s->user->display_name); } s->formatter->close_section(); @@ -1130,13 +1124,12 @@ void RGWListBucket_ObjStore_S3v2::send_versioned_response() s->formatter->close_section(); rgw_flush_formatter_and_reset(s, s->formatter); -} + } } void RGWListBucket_ObjStore_S3v2::send_response() { - - if(op_ret < 0) { + if (op_ret < 0) { set_req_state_err(s, op_ret); } dump_errno(s); @@ -1179,7 +1172,7 @@ void RGWListBucket_ObjStore_S3v2::send_response() s->formatter->dump_int("Size", iter->meta.accounted_size); auto& storage_class = rgw_placement_rule::get_canonical_storage_class(iter->meta.storage_class); s->formatter->dump_string("StorageClass", storage_class.c_str()); - if(fetchOwner == true) { + if (fetchOwner == true) { dump_owner(s, s->user->user_id, s->user->display_name); } if (s->system_request) { @@ -1204,8 +1197,6 @@ void RGWListBucket_ObjStore_S3v2::send_response() rgw_flush_formatter_and_reset(s, s->formatter); } - - void RGWGetBucketLogging_ObjStore_S3::send_response() { dump_errno(s); -- 2.39.5