From: John Spray <john.spray@redhat.com>
Date: Wed, 18 Oct 2017 10:34:53 +0000 (+0100)
Subject: mon: s/mds_blacklist_interval/mon_mds_blacklist_interval/
X-Git-Tag: v12.2.3~72^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5dcd2a59770887a3560d24712904c57f39dd3742;p=ceph.git

mon: s/mds_blacklist_interval/mon_mds_blacklist_interval/

We can rename LEVEL_DEV options at will.

Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit ed7fc5370c45deb4c80a36e9166e6dd84d4a2b99)
---

diff --git a/src/common/options.cc b/src/common/options.cc
index d12df8a58ce0..2eb3ac8bf425 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1389,7 +1389,7 @@ std::vector<Option> get_global_options() {
     .set_description("Duration in seconds that blacklist entries for clients "
                      "remain in the OSD map"),
 
-    Option("mds_blacklist_interval", Option::TYPE_FLOAT, Option::LEVEL_DEV)
+    Option("mon_mds_blacklist_interval", Option::TYPE_FLOAT, Option::LEVEL_DEV)
     .set_default(1_day)
     .set_min(1_hr)
     .set_description("Duration in seconds that blacklist entries for MDS "
diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 31869d2161fc..5c51d2f84d55 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -710,7 +710,7 @@ bool MDSMonitor::prepare_beacon(MonOpRequestRef op)
               << info.rank << " damaged" << dendl;
 
       utime_t until = ceph_clock_now();
-      until += g_conf->get_val<double>("mds_blacklist_interval");
+      until += g_conf->get_val<double>("mon_mds_blacklist_interval");
       const auto blacklist_epoch = mon->osdmon()->blacklist(info.addr, until);
       request_proposal(mon->osdmon());
       pending_fsmap.damaged(gid, blacklist_epoch);
@@ -1217,7 +1217,7 @@ bool MDSMonitor::fail_mds_gid(mds_gid_t gid)
   epoch_t blacklist_epoch = 0;
   if (info.rank >= 0 && info.state != MDSMap::STATE_STANDBY_REPLAY) {
     utime_t until = ceph_clock_now();
-    until += g_conf->get_val<double>("mds_blacklist_interval");
+    until += g_conf->get_val<double>("mon_mds_blacklist_interval");
     blacklist_epoch = mon->osdmon()->blacklist(info.addr, until);
   }