From d1d725f59311f08c9808cd8719ab05f8a4af5649 Mon Sep 17 00:00:00 2001 From: xxcs Date: Wed, 21 Aug 2019 21:36:51 +0800 Subject: [PATCH] rgw: fix one part of the bulk delete(RGWDeleteMultiObj_ObjStore_S3)fails but no error messages Fixes: None Signed-off-by: Snow Si (cherry picked from commit ff2f4af20569044352a30ca0299a068424107522) --- src/rgw/rgw_rest_s3.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 2ca7b9b805d..18b1f8fd92d 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -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()) { @@ -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); -- 2.47.3