mds: remove redundant validation of parameter

subv_window_sec will be always set to default, if not set explicitly

Signed-off-by: Igor Golikov <igolikov@redhat.com>

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 1ca5cd33b86d42b101525d00cbe4b522be8e3b12..3b267cb967c913307061d88ff0ffb5932232bfd2 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -2203,7 +2203,6 @@ update:
     msg->quota = pi->quota;
     mds->send_message_client_counted(msg, cap->get_session());
   }
-
   for (const auto &it : in->get_replicas()) {
     auto msg = make_message<MGatherCaps>();
     msg->ino = in->ino();

diff --git a/src/mds/MetricAggregator.cc b/src/mds/MetricAggregator.cc
index 6d9e04e82475f47d64e554b17ca23bdef683df14..183b9e9c6898a02673fb5303b69fb13ce8be05e1 100644 (file)
--- a/src/mds/MetricAggregator.cc
+++ b/src/mds/MetricAggregator.cc
@@ -111,11 +111,6 @@ int MetricAggregator::init() {
     });
 
   subv_window_sec = g_conf().get_val<std::chrono::seconds>("subv_metrics_window_interval").count();
-  if (!subv_window_sec) {
-    dout(0) << "subv_metrics_window_interval is not set, setting to 300 seconds" << dendl;
-    subv_window_sec = 300;
-  }
- 
   return 0;
 }
 

diff --git a/src/mds/MetricsHandler.cc b/src/mds/MetricsHandler.cc
index 63328e40ed7d6da22cf8d0571dcb886da4e6bea2..61f5b88771a05f256a14bae792ee85795f76be70 100644 (file)
--- a/src/mds/MetricsHandler.cc
+++ b/src/mds/MetricsHandler.cc
@@ -86,10 +86,6 @@ void MetricsHandler::init() {
   }
 
   subv_window_sec = g_conf().get_val<std::chrono::seconds>("subv_metrics_window_interval").count();
-  if (!subv_window_sec) {
-    dout(0) << "subv_metrics_window_interval is not set, setting to 300 seconds" << dendl;
-    subv_window_sec = 300;
-  }
 
   updater = std::thread([this]() {
       ceph_pthread_setname("mds-metrics");