Merge pull request #5624 from vumrao/wip-vumrao-12714

rgw : setting max number of buckets for users via ceph.conf option

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

diff --cc src/common/config_opts.h
index ece6f975c070ccff3365ad10769028edeae1ab60,a1c88b196289d1617889cef5e062ce830f7228ad..a09873666e319195f2556ccb49073676029def8a
--- 1/src/common/config_opts.h
--- 2/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@@ -1123,12 -1123,8 +1123,13 @@@ OPTION(rgw_multipart_min_part_size, OPT
  OPTION(rgw_multipart_part_upload_limit, OPT_INT, 10000) // parts limit in multipart upload
  
  OPTION(rgw_olh_pending_timeout_sec, OPT_INT, 3600) // time until we retire a pending olh change
+ OPTION(rgw_user_max_buckets, OPT_U32, 1000) // global option to set max buckets count for all user
  
 +OPTION(rgw_objexp_gc_interval, OPT_U32, 60 * 10) // maximum time between round of expired objects garbage collecting
 +OPTION(rgw_objexp_time_step, OPT_U32, 4096) // number of seconds for rounding the timestamps
 +OPTION(rgw_objexp_hints_num_shards, OPT_U32, 127) // maximum number of parts in which the hint index is stored in
 +OPTION(rgw_objexp_chunk_size, OPT_U32, 100) // maximum number of entries in a single operation when processing objexp data
 +
  OPTION(mutex_perf_counter, OPT_BOOL, false) // enable/disable mutex perf counter
  OPTION(throttler_perf_counter, OPT_BOOL, true) // enable/disable throttler perf counter
  

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

diff --cc src/test/cli/radosgw-admin/help.t
Simple merge