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 d12df8a58ce03e5d3206ec91c3c1807b06aaf4db..2eb3ac8bf425cd1dbef0b7ca0bdf76a7d7515fa0 100644 (file)
--- 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 31869d2161fcb7d3a11ee7abb515edd804fe7e6f..5c51d2f84d554a46d8389ead0a0659e5e96058ef 100644 (file)
--- 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);
   }