From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 12 Jul 2023 20:13:34 +0000 (-0400)
Subject: rgw: preserve RGW_ATTR_CRYPT_PARTS of already-replicated objects
X-Git-Tag: v17.2.7~116^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8fa1b790146d3ef70f2ace10d6fca128341bfa9d;p=ceph.git

rgw: preserve RGW_ATTR_CRYPT_PARTS of already-replicated objects

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 902d07499df4ed68721821691e0477e673ab15a5)
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 66b2d8019877..1c1bce52a50e 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3493,9 +3493,11 @@ public:
         manifest_bl = std::move(iter->second);
         src_attrs.erase(iter);
 
-        // if the source object was encrypted, preserve the original object's
-        // part lengths
-        if (src_attrs.count(RGW_ATTR_CRYPT_MODE)) {
+        // if the source object was encrypted, preserve the part lengths from
+        // the original object's manifest in RGW_ATTR_CRYPT_PARTS. if the object
+        // already replicated and has the RGW_ATTR_CRYPT_PARTS attr, preserve it
+        if (src_attrs.count(RGW_ATTR_CRYPT_MODE) &&
+            !src_attrs.count(RGW_ATTR_CRYPT_PARTS)) {
           std::vector<size_t> parts_len;
           int r = RGWGetObj_BlockDecrypt::read_manifest_parts(dpp, manifest_bl,
                                                               parts_len);