]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix md5 not match for RGWBulkUploadOp upload when enable rgw compression 45433/head
authoryuliyang_yewu <yuliyang_yewu@cmss.chinamobile.com>
Fri, 24 Jul 2020 00:57:31 +0000 (08:57 +0800)
committerCory Snyder <csnyder@iland.com>
Wed, 16 Mar 2022 16:45:09 +0000 (12:45 -0400)
Fixes: https://tracker.ceph.com/issues/46625
Signed-off-by: yuliyang_yewu <yuliyang_yewu@cmss.chinamobile.com>
(cherry picked from commit 3fc487d25e81ca2135729b120b9c832b42a26266)

Conflicts:
src/rgw/rgw_op.cc

Cherry-pick notes:
- cs_info.compressor_message = compressor->get_compressor_message(); line not on Octopus

src/rgw/rgw_op.cc

index 2339dccb7fd0e092f2677cf5d8847fdf5390b548..fe0ad68758a6185e3a018b669e23ce1438928333 100644 (file)
@@ -7366,7 +7366,7 @@ int RGWBulkUploadOp::handle_file(const boost::string_ref path,
     ceph::bufferlist tmp;
     RGWCompressionInfo cs_info;
     cs_info.compression_type = plugin->get_type_name();
-    cs_info.orig_size = s->obj_size;
+    cs_info.orig_size = size;
     cs_info.blocks = std::move(compressor->get_compression_blocks());
     encode(cs_info, tmp);
     attrs.emplace(RGW_ATTR_COMPRESSION, std::move(tmp));