]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
common/options: drop 'safe' flag on plugin dir options
authorSage Weil <sage@redhat.com>
Wed, 10 Jan 2018 18:29:14 +0000 (12:29 -0600)
committerSage Weil <sage@redhat.com>
Tue, 6 Mar 2018 20:44:49 +0000 (14:44 -0600)
These were only marked safe to accomodate the unit test CEPH_LIB hackery,
which is now removed.

Signed-off-by: Sage Weil <sage@redhat.com>
src/common/options.cc

index cd76c49498482d6e7bca521be54af27905488abf..837c6e1d9dde9add20d9474dc936eec55bd3053e 100644 (file)
@@ -451,8 +451,7 @@ std::vector<Option> get_global_options() {
     Option("erasure_code_dir", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default(CEPH_PKGLIBDIR"/erasure-code")
     .set_description("directory where erasure-code plugins can be found")
-    .add_service({"mon", "osd"})
-    .set_safe(),
+    .add_service({"mon", "osd"}),
 
     // logging
     Option("log_file", Option::TYPE_STR, Option::LEVEL_BASIC)
@@ -615,8 +614,7 @@ std::vector<Option> get_global_options() {
 
     Option("plugin_dir", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default(CEPH_PKGLIBDIR)
-    .set_description("")
-    .set_safe(),
+    .set_description(""),
 
     Option("xio_trace_mempool", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(false)