Merge pull request ceph#50504 from cbodley/wip-59048

cbodley · web-flow · commit bd0eee3a9ed7 · 2023-03-22T13:22:33.000-04:00
rgw/s3: DeleteObjects response uses correct delete_marker flag

Reviewed-by: Adam C. Emerson &lt;aemerson@redhat.com&gt;
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
@@ -7040,7 +7040,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);

Original file line number	Diff line number	Diff line change
`@@ -7040,7 +7040,7 @@ void RGWDeleteMultiObj::handle_individual_object(const rgw_obj_key& o, optional_`
`7040`	`7040`	`op_ret = 0;`
`7041`	`7041`	`}`
`7042`	`7042`
`7043`		`- send_partial_response(o, obj->get_delete_marker(), del_op->result.version_id, op_ret, formatter_flush_cond);`
	`7043`	`+ send_partial_response(o, del_op->result.delete_marker, del_op->result.version_id, op_ret, formatter_flush_cond);`
`7044`	`7044`
`7045`	`7045`	`// send request to notification manager`
`7046`	`7046`	`int ret = res->publish_commit(this, obj_size, ceph::real_clock::now(), etag, version_id);`