From: xxcs <silonghu@inspur.com>
Date: Wed, 21 Aug 2019 13:36:51 +0000 (+0800)
Subject: rgw: fix one part of the bulk delete(RGWDeleteMultiObj_ObjStore_S3)fails but no error... 
X-Git-Tag: v15.1.0~87^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ff2f4af20569044352a30ca0299a068424107522;p=ceph-ci.git

rgw: fix one part of the bulk delete(RGWDeleteMultiObj_ObjStore_S3)fails but no error messages
Fixes: None
Signed-off-by: Snow Si <silonghu@inspur.com>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index acb7b308fa6..7cd5b69a5d9 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -2879,7 +2879,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()) {
@@ -2890,13 +2890,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);