From af2f825ec3c769dbbd4e1544f7101275457768ef Mon Sep 17 00:00:00 2001
From: David Zafman <dzafman@redhat.com>
Date: Fri, 6 Sep 2019 11:20:10 -0700
Subject: [PATCH] test: Allow fractional milliseconds to make test possible

Fixes: https://tracker.ceph.com/issues/41689

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 6d2e4cb109caff8dae5e5e18563b6305131b488b)

Conflicts:
	src/common/options.cc (trivial)
---
 qa/standalone/misc/network-ping.sh | 2 +-
 src/common/options.cc              | 2 +-
 src/mgr/ClusterState.cc            | 2 +-
 src/mon/PGMap.cc                   | 2 +-
 src/osd/OSD.cc                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qa/standalone/misc/network-ping.sh b/qa/standalone/misc/network-ping.sh
index 15f2e68dabe4..b2b299d63ee8 100755
--- a/qa/standalone/misc/network-ping.sh
+++ b/qa/standalone/misc/network-ping.sh
@@ -111,7 +111,7 @@ function TEST_network_ping_test2() {
     local dir=$1
 
     export CEPH_ARGS
-    export EXTRA_OPTS=" --mon_warn_on_slow_ping_time=1"
+    export EXTRA_OPTS=" --mon_warn_on_slow_ping_time=0.001"
     run_mon $dir a || return 1
     run_mgr $dir x || return 1
     run_osd $dir 0 || return 1
diff --git a/src/common/options.cc b/src/common/options.cc
index 05bbcd25cf5e..217944c85deb 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1732,7 +1732,7 @@ std::vector<Option> get_global_options() {
     .add_service("mgr")
     .set_description("Issue a health warning if there are fewer OSDs than osd_pool_default_size"),
 
-    Option("mon_warn_on_slow_ping_time", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
+    Option("mon_warn_on_slow_ping_time", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
     .set_default(0)
     .add_service("mgr")
     .set_description("Override mon_warn_on_slow_ping_ratio with specified threshold in milliseconds")
diff --git a/src/mgr/ClusterState.cc b/src/mgr/ClusterState.cc
index 5ef19327c70e..891bd562a51f 100644
--- a/src/mgr/ClusterState.cc
+++ b/src/mgr/ClusterState.cc
@@ -225,7 +225,7 @@ bool ClusterState::asok_command(std::string_view admin_command, const cmdmap_t&
     // Default to health warning level if nothing specified
     if (!(cmd_getval(g_ceph_context, cmdmap, "value", value))) {
       // Convert milliseconds to microseconds
-      value = static_cast<int64_t>(g_ceph_context->_conf.get_val<uint64_t>("mon_warn_on_slow_ping_time")) * 1000;
+      value = static_cast<int64_t>(g_ceph_context->_conf.get_val<double>("mon_warn_on_slow_ping_time")) * 1000;
       if (value == 0) {
         double ratio = g_conf().get_val<double>("mon_warn_on_slow_ping_ratio");
 	value = g_conf().get_val<int64_t>("osd_heartbeat_grace");
diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index fe88a68d373e..5e5e26ba758f 100644
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -2713,7 +2713,7 @@ void PGMap::get_health_checks(
 
   // SLOW_PING_TIME
   // Convert milliseconds to microseconds
-  auto warn_slow_ping_time = cct->_conf.get_val<uint64_t>("mon_warn_on_slow_ping_time") * 1000;
+  auto warn_slow_ping_time = cct->_conf.get_val<double>("mon_warn_on_slow_ping_time") * 1000;
   auto grace = cct->_conf.get_val<int64_t>("osd_heartbeat_grace");
   if (warn_slow_ping_time == 0) {
     double ratio = cct->_conf.get_val<double>("mon_warn_on_slow_ping_ratio");
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index b9756bb34bc8..07dc18a69275 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2732,7 +2732,7 @@ will start to track new ops received afterwards.";
     int64_t value = 0;
     if (!(cmd_getval(cct, cmdmap, "value", value))) {
       // Convert milliseconds to microseconds
-      value = static_cast<int64_t>(g_conf().get_val<uint64_t>("mon_warn_on_slow_ping_time")) * 1000;
+      value = static_cast<int64_t>(g_conf().get_val<double>("mon_warn_on_slow_ping_time")) * 1000;
       if (value == 0) {
         double ratio = g_conf().get_val<double>("mon_warn_on_slow_ping_ratio");
         value = g_conf().get_val<int64_t>("osd_heartbeat_grace");
-- 
2.47.3