From ec4f5cd0e15748d9dc7a579a8c731bbfe30a5aef Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Thu, 28 Oct 2021 15:20:26 -0400 Subject: [PATCH] rgw: fix self-comparison for RGWCopyObj optimization when RGWCopyObj is copying an object onto itself (for example, 's3cmd modify' does this to add/remove metadata), we can avoid the need to increment the reference count of each tail object. this self-comparison check was broken during zipper refactoring, comparing raw pointers instead of the object keys Fixes: https://tracker.ceph.com/issues/53003 Signed-off-by: Casey Bodley --- src/rgw/rgw_rados.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index cf16234849ac5..e5d452063c369 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -4480,7 +4480,7 @@ int RGWRados::copy_obj(RGWObjectCtx& obj_ctx, bufferlist first_chunk; - bool copy_itself = (dest_obj == src_obj); + const bool copy_itself = (dest_obj->get_obj() == src_obj->get_obj()); RGWObjManifest *pmanifest; ldpp_dout(dpp, 20) << "dest_obj=" << dest_obj << " src_obj=" << src_obj << " copy_itself=" << (int)copy_itself << dendl; -- 2.39.5