osd: make open classes on start optional

This is cuttlefish; default to the old behavior!

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 6f996223fb34650771772b88355046746f238cf2)

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 7940cc760a153ac9ae2e393d80907e3dd5baf5e8..6cb9fe2fc99ba08b1672169585bf63ecd23f925d 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -431,6 +431,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, false)
 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 e2894e81559c9ab0fe64de235c353bf7f4d98a73..679f0e143bdd2ca6afa97ab2a43bfa702cb1ace6 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1090,7 +1090,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);