From: Jane Zhu <jzhu116@bloomberg.net>
Date: Wed, 20 Aug 2025 18:38:23 +0000 (+0000)
Subject: rgw: discard olh_ attributes when copying object from a versioning-suspended bucket... 
X-Git-Tag: testing/wip-jcollin-testing-20250924.023828-squid~8^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d6c598052d82e4def14d097de65ccd408e6def93;p=ceph-ci.git

rgw: discard olh_ attributes when copying object from a versioning-suspended bucket to a versioning-disabled bucket

Signed-off-by: Jane Zhu <jzhu116@bloomberg.net>
(cherry picked from commit 3fed58f43c3cb3977130926a2d1bca551deefade)
---

diff --git a/src/rgw/driver/rados/rgw_rados.cc b/src/rgw/driver/rados/rgw_rados.cc
index c8bf7257f31..58df77bc1f0 100644
--- a/src/rgw/driver/rados/rgw_rados.cc
+++ b/src/rgw/driver/rados/rgw_rados.cc
@@ -4770,7 +4770,7 @@ int RGWRados::copy_obj(RGWObjectCtx& src_obj_ctx,
   if (lh != attrs.end())
     src_attrs[RGW_ATTR_OBJECT_LEGAL_HOLD] = lh->second;
 
-  if (dest_bucket_info.flags & BUCKET_VERSIONS_SUSPENDED) {
+  if (!dest_bucket_info.versioning_enabled()) {
     src_attrs.erase(RGW_ATTR_OLH_ID_TAG);
     src_attrs.erase(RGW_ATTR_OLH_INFO);
     src_attrs.erase(RGW_ATTR_OLH_VER);