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

Resolves: rhbz#2390658

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 f211e7a35fa0961270fb360137e0d614f51ae84b..a0a848a4ccce53ae773d999e7783106d5bd8c731 100644 (file)
--- a/src/rgw/driver/rados/rgw_rados.cc
+++ b/src/rgw/driver/rados/rgw_rados.cc
@@ -5001,7 +5001,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);