osd: make open classes on start optional

Some might want the old behavior.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 335a92071521aeab759c1d8034c36cef2643f6cf..3b9d025393fe2c5d68a3e269d54ab58050276506 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -443,6 +443,7 @@ OPTION(osd_deep_scrub_stride, OPT_INT, 524288)
 OPTION(osd_scan_list_ping_tp_interval, OPT_U64, 100)
 OPTION(osd_auto_weight, OPT_BOOL, false)
 OPTION(osd_class_dir, OPT_STR, CEPH_LIBDIR "/rados-classes") // where rados plugins are stored
+OPTION(osd_open_classes_on_start, OPT_BOOL, true)
 OPTION(osd_check_for_log_corruption, OPT_BOOL, false)
 OPTION(osd_use_stale_snap, OPT_BOOL, false)
 OPTION(osd_rollback_to_cluster_snap, OPT_STR, "")

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index c642a068e1c7a3f34f83cc17e8fabc7f6aa5c31c..58020d0c3226ed0413651dea44b2b95c4701d1b4 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1165,7 +1165,9 @@ int OSD::init()
 
   class_handler = new ClassHandler();
   cls_initialize(class_handler);
-  class_handler->open_all_classes();
+
+  if (g_conf->osd_open_classes_on_start)
+    class_handler->open_all_classes();
 
   // load up "current" osdmap
   assert_warn(!osdmap);