]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/s3: DeleteObjects response uses correct delete_marker flag 51024/head
authorCasey Bodley <cbodley@redhat.com>
Mon, 13 Mar 2023 17:40:02 +0000 (13:40 -0400)
committerCasey Bodley <cbodley@redhat.com>
Tue, 11 Apr 2023 13:42:07 +0000 (09:42 -0400)
use delete_marker from the DeleteOp result, not from the sal::Object

Fixes: https://tracker.ceph.com/issues/59048
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 7288cbe28035867540b68dfcbc4894e1fb50ea2e)

src/rgw/rgw_op.cc

index 21b7737f66f000e84d35b4a1f503031996e8b5cb..ba84d3f8c51c26e8e706de4bb39fdbf35194b809 100644 (file)
@@ -7004,7 +7004,7 @@ void RGWDeleteMultiObj::handle_individual_object(const rgw_obj_key& o, optional_
     op_ret = 0;
   }
 
-  send_partial_response(o, obj->get_delete_marker(), del_op->result.version_id, op_ret, formatter_flush_cond);
+  send_partial_response(o, del_op->result.delete_marker, del_op->result.version_id, op_ret, formatter_flush_cond);
 
   // send request to notification manager
   int ret = res->publish_commit(this, obj_size, ceph::real_clock::now(), etag, version_id);