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

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

diff --cc src/common/options.cc
index b5675608306f7bcd2faf429333ce01dc6a52c469,eb72facd181d70d3a7609431b68b642e48e802cb..e82abcb4366b446ed1859536962e94f78ff17560
--- 1/src/common/options.cc
--- 2/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(""),

diff --cc src/rgw/rgw_file.cc
Simple merge

diff --cc src/rgw/rgw_op.cc
Simple merge

diff --cc src/rgw/rgw_op.h
Simple merge

diff --cc src/rgw/rgw_rest_swift.cc
Simple merge

diff --cc src/rgw/rgw_rest_swift.h
Simple merge