From: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Date: Wed, 25 Sep 2019 11:11:03 +0000 (+0800)
Subject: rgw: compression type should be same during multipart uploading
X-Git-Tag: v15.1.0~897^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f88b51cdafb90e2cd233b73c5ac457db342793da;p=ceph.git

rgw: compression type should be same during multipart uploading

Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 90279c1314a4..db30dc953570 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -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 ("