From: Kefu Chai <kchai@redhat.com>
Date: Tue, 13 Feb 2018 08:37:00 +0000 (+0800)
Subject: common/options,mon: switch some option to TYPE_SECS
X-Git-Tag: v13.0.2~25^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=80ee71ab5aef9e6a9cf8b9dfe720daf96ed86461;p=ceph-ci.git

common/options,mon: switch some option to TYPE_SECS

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 1588d364d37..d89667c1ce5 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -4710,7 +4710,7 @@ std::vector<Option> get_global_options() {
     .set_description("Filesystem path to the ceph-mgr data directory, used to "
                      "contain keyring."),
 
-    Option("mgr_tick_period", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+    Option("mgr_tick_period", Option::TYPE_SECS, Option::LEVEL_ADVANCED)
     .set_default(2)
     .add_service("mgr")
     .set_description("Period in seconds of beacon messages to monitor"),
@@ -4773,7 +4773,7 @@ std::vector<Option> get_global_options() {
     .set_description("Period in seconds between monitor-to-manager "
                      "health/status updates"),
 
-    Option("mon_mgr_beacon_grace", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+    Option("mon_mgr_beacon_grace", Option::TYPE_SECS, Option::LEVEL_ADVANCED)
     .set_default(30)
     .add_service("mon")
     .set_description("Period in seconds from last beacon to monitor marking "
diff --git a/src/mgr/MgrStandby.cc b/src/mgr/MgrStandby.cc
index 0cb1ab2ac4b..361201db8ff 100644
--- a/src/mgr/MgrStandby.cc
+++ b/src/mgr/MgrStandby.cc
@@ -225,7 +225,8 @@ void MgrStandby::tick()
     active_mgr->tick();
   }
 
-  timer.add_event_after(g_conf->get_val<int64_t>("mgr_tick_period"),
+  timer.add_event_after(
+      g_conf->get_val<std::chrono::seconds>("mgr_tick_period").count(),
       new FunctionContext([this](int r){
           tick();
       }
diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 945a3a2189f..5fb8bdddf30 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -510,13 +510,13 @@ void MgrMonitor::tick()
 
   const auto now = ceph::coarse_mono_clock::now();
 
-  const auto mgr_beacon_grace = std::chrono::seconds(
-      g_conf->get_val<int64_t>("mon_mgr_beacon_grace"));
+  const auto mgr_beacon_grace =
+      g_conf->get_val<std::chrono::seconds>("mon_mgr_beacon_grace");
 
   // Note that this is the mgr daemon's tick period, not ours (the
   // beacon is sent with this period).
-  const auto mgr_tick_period = std::chrono::seconds(
-      g_conf->get_val<int64_t>("mgr_tick_period"));
+  const auto mgr_tick_period =
+      g_conf->get_val<std::chrono::seconds>("mgr_tick_period");
 
   if (last_tick != ceph::coarse_mono_clock::time_point::min()
       && (now - last_tick > (mgr_beacon_grace - mgr_tick_period))) {