rgw - make starting quota/gc threads configurable

Fixes: 11047
Backport: hammer

Signed-off-by: Guang Yang <yguang@yahoo-inc.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 6037640b7ec67f1379455cab210451844d0718a3..cb7b3d93318c8b4d3e4f6feaecea5ddf4baced19 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -905,6 +905,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 92ae502445930742612fde116c5b38e484f2f5c1..3b93e8993d99b76a8629aec724cc7a7dd2641170 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -1042,7 +1042,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) {
     derr << "Couldn't init storage provider (RADOS)" << dendl;
     r = EIO;