From: Sage Weil <sage@redhat.com>
Date: Fri, 14 Sep 2018 19:05:27 +0000 (-0500)
Subject: mgr: make devicehealth always-on
X-Git-Tag: v14.0.1~255^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5d68f77360869702d8d8ac5d8d963f1df7b1096e;p=ceph.git

mgr: make devicehealth always-on

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

diff --git a/src/common/options.cc b/src/common/options.cc
index 2777853a6e96..f60e3fbf6039 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4843,7 +4843,7 @@ std::vector<Option> get_global_options() {
     .set_description("Filesystem path to manager modules."),
 
     Option("mgr_initial_modules", Option::TYPE_STR, Option::LEVEL_BASIC)
-    .set_default("restful status balancer iostat devicehealth crash")
+    .set_default("restful status balancer iostat crash")
     .set_flag(Option::FLAG_NO_MON_UPDATE)
     .set_flag(Option::FLAG_CLUSTER_CREATE)
     .add_service("mon")
diff --git a/src/mgr/mgr_commands.cc b/src/mgr/mgr_commands.cc
index fa9b15e42b9e..702b858eadc3 100644
--- a/src/mgr/mgr_commands.cc
+++ b/src/mgr/mgr_commands.cc
@@ -18,6 +18,7 @@ const std::set<std::string> always_on_modules = {
   "crash",
   "status",
   "balancer",
+  "devicehealth",
 };
 
 /* The set of statically defined (C++-handled) commands.  This