summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2013-07-26 14:02:07 -0700
committerSage Weil <sage@inktank.com>2013-08-07 13:53:10 -0700
commit65bfa4941f983c988837cd010f731966ff53fd19 (patch)
tree1175d98b5c30e7f8a8e3dab4c7a97f7ac8afbfa0
parente8253ae5451b1c8e3d7d50199b8db7b2d4c66486 (diff)
downloadceph-65bfa4941f983c988837cd010f731966ff53fd19.tar.gz
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)
-rw-r--r--src/common/config_opts.h1
-rw-r--r--src/osd/OSD.cc4
2 files changed, 4 insertions, 1 deletions
diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 7940cc760a1..6cb9fe2fc99 100644
--- 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 e2894e81559..679f0e143bd 100644
--- 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);