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>

diff --git a/src/common/options.cc b/src/common/options.cc
index 62c0723143de8edfc2e6016bfc7f65bcdac12153..daca237f03ff1a388b38352cbda1550c4d445f21 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1368,7 +1368,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 d57e30dc175073e05a842d6426f3f9e07f44479c..29a33511c37cedaa7ec37a7b3ba3427f1018f562 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -684,7 +684,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);
@@ -1138,7 +1138,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);
   }