From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 13 Mar 2023 17:40:02 +0000 (-0400)
Subject: rgw/s3: DeleteObjects response uses correct delete_marker flag
X-Git-Tag: v18.1.0~151^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e1da53ffa46eadf4331dbf6768705aed4b0deb8e;p=ceph-ci.git

rgw/s3: DeleteObjects response uses correct delete_marker flag

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)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 21b7737f66f..ba84d3f8c51 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -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);