From: Lei Liu <liul.stone@gmail.com>
Date: Tue, 22 Jan 2019 04:09:45 +0000 (+0800)
Subject: rgw: Replace COMPLETE_MULTIPART_MAX_LEN with configurable rgw_max_put_param_size
X-Git-Tag: v15.0.0~106^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7bc4c09ccd97d1e20d0c17d6cb5768f37e16ba55;p=ceph.git

rgw: Replace COMPLETE_MULTIPART_MAX_LEN with configurable rgw_max_put_param_size

Fixes: http://tracker.ceph.com/issues/38002

Signed-off-by: Lei Liu <liul.stone@gmail.com>
---

diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index d5eb818986a5..c1cd458eac37 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -1550,8 +1550,8 @@ int RGWCompleteMultipart_ObjStore::get_params()
     return op_ret;
   }
 
-#define COMPLETE_MULTIPART_MAX_LEN (1024 * 1024) /* api defines max 10,000 parts, this should be enough */
-  std::tie(op_ret, data) = rgw_rest_read_all_input(s, COMPLETE_MULTIPART_MAX_LEN);
+  const auto max_size = s->cct->_conf->rgw_max_put_param_size;
+  std::tie(op_ret, data) = rgw_rest_read_all_input(s, max_size);
   if (op_ret < 0)
     return op_ret;