From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 28 Oct 2021 19:20:26 +0000 (-0400)
Subject: rgw: fix self-comparison for RGWCopyObj optimization
X-Git-Tag: v16.2.11~463^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f53b46e47093eca083f5b46861ac2cbfc64c16b4;p=ceph.git

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 <cbodley@redhat.com>
(cherry picked from commit ec4f5cd0e15748d9dc7a579a8c731bbfe30a5aef)
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 3bee2203ce1e..62c8d315f8da 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -4357,7 +4357,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;