From 9b06985caec27fc102769e46799ca6608e80eb85 Mon Sep 17 00:00:00 2001
From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Tue, 19 Sep 2017 14:46:53 +0200
Subject: [PATCH] rgw: rename the configurables for metadata limits to start
 with rgw_.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---
 src/common/options.cc     |  8 ++++++++
 src/rgw/rgw_op.h          | 14 ++++++++------
 src/rgw/rgw_rest_swift.cc | 14 +++++++++-----
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/common/options.cc b/src/common/options.cc
index 318597e4432..eb72facd181 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4163,6 +4163,14 @@ std::vector<Option> get_rgw_options() {
     .set_default(1 * 1024 * 1024)
     .set_description(""),
 
+    Option("rgw_max_attr_size", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
+    .set_default(0)
+    .set_description("The maximum length of metadata value. 0 skips the check"),
+
+    Option("rgw_max_attr_name_len", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
+    .set_default(0)
+    .set_description("The maximum length of metadata name. 0 skips the check"),
+
     Option("rgw_max_attrs_num_in_req", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
     .set_default(0)
     .set_description("The maximum number of metadata items that can be put via single request"),
diff --git a/src/rgw/rgw_op.h b/src/rgw/rgw_op.h
index 38990bbce2c..8b2056906bb 100644
--- a/src/rgw/rgw_op.h
+++ b/src/rgw/rgw_op.h
@@ -1914,19 +1914,21 @@ static inline int rgw_get_request_metadata(CephContext* const cct,
       std::string attr_name(RGW_ATTR_PREFIX);
       attr_name.append(name);
 
-      /* Check early whether we aren't going behind the limit on attribute
+      /* Check roughly whether we aren't going behind the limit on attribute
        * name. Passing here doesn't guarantee that an OSD will accept that
        * as ObjectStore::get_max_attr_name_length() can set the limit even
-       * lower. However, we're claiming "max_meta_name_length" in /info as
-       * being dependent on the "osd_max_attr_name_len".  */
-      if (attr_name.length() > cct->_conf->osd_max_attr_name_len) {
+       * lower than the "osd_max_attr_name_len" configurable.  */
+      const size_t max_attr_name_len = \
+        cct->_conf->get_val<size_t>("rgw_max_attr_name_len");
+      if (max_attr_name_len && attr_name.length() > max_attr_name_len) {
         return -ENAMETOOLONG;
       }
 
       /* Similar remarks apply to the check for value size. We're veryfing
        * it early at the RGW's side as it's being claimed in /info. */
-      if (cct->_conf->osd_max_attr_size &&
-          xattr.length() > cct->_conf->osd_max_attr_size) {
+      const size_t max_attr_size = \
+        cct->_conf->get_val<size_t>("rgw_max_attr_size");
+      if (max_attr_size && xattr.length() > max_attr_size) {
         return -EFBIG;
       }
 
diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index 5b1b1a8cfae..73847c24cd0 100644
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -654,7 +654,7 @@ static inline int handle_metadata_errors(req_state* const s, const int op_ret)
      * (stored as xattr) size. */
     const auto error_message = boost::str(
       boost::format("Metadata value longer than %lld")
-        % int(s->cct->_conf->osd_max_attr_size));
+        % s->cct->_conf->get_val<size_t>("rgw_max_attr_size"));
     set_req_state_err(s, EINVAL, error_message);
     return -EINVAL;
   } else if (op_ret == -E2BIG) {
@@ -1715,11 +1715,15 @@ void RGWInfo_ObjStore_SWIFT::list_swift_data(Formatter& formatter,
   string ceph_version(CEPH_GIT_NICE_VER);
   formatter.dump_string("version", ceph_version);
 
-  const size_t meta_name_limit = g_conf->osd_max_attr_name_len
-    - strlen(RGW_ATTR_PREFIX RGW_AMZ_META_PREFIX);
-  formatter.dump_int("max_meta_name_length", meta_name_limit);
+  const size_t max_attr_name_len = \
+    g_conf->get_val<size_t>("rgw_max_attr_name_len");
+  if (max_attr_name_len) {
+    const size_t meta_name_limit = \
+      max_attr_name_len - strlen(RGW_ATTR_PREFIX RGW_AMZ_META_PREFIX);
+    formatter.dump_int("max_meta_name_length", meta_name_limit);
+  }
 
-  const size_t meta_value_limit = g_conf->osd_max_attr_size;
+  const size_t meta_value_limit = g_conf->get_val<size_t>("rgw_max_attr_size");
   if (meta_value_limit) {
     formatter.dump_int("max_meta_value_length", meta_value_limit);
   }
-- 
2.47.3