Skip to content

Commit

Permalink
rgw: fix one part of the bulk delete(RGWDeleteMultiObj_ObjStore_S3)fa…
Browse files Browse the repository at this point in the history
…ils but no error messages

Fixes: None
Signed-off-by: Snow Si <silonghu@inspur.com>

(cherry picked from commit ff2f4af)
  • Loading branch information
xxcs authored and shyukri committed Feb 8, 2020
1 parent e28dea6 commit d1d725f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/rgw/rgw_rest_s3.cc
Expand Up @@ -3163,7 +3163,7 @@ void RGWDeleteMultiObj_ObjStore_S3::send_partial_response(rgw_obj_key& key,
const string& marker_version_id, int ret)
{
if (!key.empty()) {
if (op_ret == 0 && !quiet) {
if (ret == 0 && !quiet) {
s->formatter->open_object_section("Deleted");
s->formatter->dump_string("Key", key.name);
if (!key.instance.empty()) {
Expand All @@ -3174,13 +3174,13 @@ void RGWDeleteMultiObj_ObjStore_S3::send_partial_response(rgw_obj_key& key,
s->formatter->dump_string("DeleteMarkerVersionId", marker_version_id);
}
s->formatter->close_section();
} else if (op_ret < 0) {
} else if (ret < 0) {
struct rgw_http_error r;
int err_no;

s->formatter->open_object_section("Error");

err_no = -op_ret;
err_no = -ret;
rgw_get_errno_s3(&r, err_no);

s->formatter->dump_string("Key", key.name);
Expand Down

0 comments on commit d1d725f

Please sign in to comment.