From: Matt Benjamin <mbenjamin@redhat.com>
Date: Tue, 19 Sep 2017 16:09:38 +0000 (-0400)
Subject: Merge pull request #15369 from rzarzynski/wip-rgw-custom-errmsgs-2
X-Git-Tag: v13.0.1~865
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1456dbfeab265efca6baae6bbf2ff650e80a60f4;p=ceph.git

Merge pull request #15369 from rzarzynski/wip-rgw-custom-errmsgs-2

rgw: improve handling of Swift's error messages and limits
---

1456dbfeab265efca6baae6bbf2ff650e80a60f4
diff --cc src/common/options.cc
index b5675608306f,eb72facd181d..e82abcb4366b
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@@ -4183,9 -4160,21 +4183,21 @@@ std::vector<Option> get_rgw_options() 
      .set_description(""),
  
      Option("rgw_max_put_param_size", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
 -    .set_default(1 * 1024 * 1024)
 +    .set_default(1_M)
      .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"),
+ 
      Option("rgw_override_bucket_index_max_shards", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
      .set_default(0)
      .set_description(""),