]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw: compression type should be same during multipart uploading
authorzhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Wed, 25 Sep 2019 11:11:03 +0000 (19:11 +0800)
committerzhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Wed, 25 Sep 2019 11:11:03 +0000 (19:11 +0800)
Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
src/rgw/rgw_op.cc

index 90279c1314a4fda5fdaf68fe917b541a84aad591..db30dc95357079d03da260de6287365713f00c39 100644 (file)
@@ -6042,7 +6042,7 @@ void RGWCompleteMultipart::execute()
       }
 
       bool part_compressed = (obj_part.cs_info.compression_type != "none");
-      if ((obj_iter != obj_parts.begin()) &&
+      if ((handled_parts > 0) &&
           ((part_compressed != compressed) ||
             (cs_info.compression_type != obj_part.cs_info.compression_type))) {
           ldpp_dout(this, 0) << "ERROR: compression type was changed during multipart upload ("