RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29795 from xxcs/xxcs03

Browse Source 
rgw: fix one part of the bulk delete(RGWDeleteMultiObj_ObjStore_S3) fails but no error messages
This commit is contained in:
Ali Maredia 2020-01-23 12:56:20 -05:00 committed by GitHub
commit 4a7f8cfb89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rgw/rgw_rest_s3.cc
View File

@ -3299,7 +3299,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()) {
@ -3310,13 +3310,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);