rgw - make starting quota/gc threads configurable

Fixes: 11047
Backport: hammer

Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
(cherry picked from commit a88712aeb4e7cd4208b9a707aa3bd4d03340c3ff)

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 8e817e140347679a1c00953e46fd3ba4b4dc06e9..5a1638aeb566f529e55c4ad4b18abeacc959acf7 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -923,6 +923,12 @@ OPTION(rgw_override_bucket_index_max_shards, OPT_U32, 0)
  */
 OPTION(rgw_bucket_index_max_aio, OPT_U32, 8)
 
+/**
+ * whether or not the quota/gc threads should be started
+ */
+OPTION(rgw_enable_quota_threads, OPT_BOOL, true)
+OPTION(rgw_enable_gc_threads, OPT_BOOL, true)
+
 OPTION(rgw_data, OPT_STR, "/var/lib/ceph/radosgw/$cluster-$id")
 OPTION(rgw_enable_apis, OPT_STR, "s3, swift, swift_auth, admin")
 OPTION(rgw_cache_enabled, OPT_BOOL, true)   // rgw cache enabled

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index d15695885bb15ab5a547b1e4286feb802739d54c..756e079e1a2ca6295f67d98ac9e9f25a9d0e245a 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -1064,7 +1064,8 @@ int main(int argc, const char **argv)
   FCGX_Init();
 
   int r = 0;
-  RGWRados *store = RGWStoreManager::get_storage(g_ceph_context, true, true);
+  RGWRados *store = RGWStoreManager::get_storage(g_ceph_context,
+      g_conf->rgw_enable_gc_threads, g_conf->rgw_enable_quota_threads);
   if (!store) {
     mutex.Lock();
     init_timer.cancel_all_events();