From: Kefu Chai <kchai@redhat.com>
Date: Wed, 17 Oct 2018 11:38:30 +0000 (+0800)
Subject: crimson/mon: remove timeout support from mon::Client::authenticate()
X-Git-Tag: v14.1.0~1159^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=36fb31867f63cc236ee584b645dff1c25e72b8d5;p=ceph.git

crimson/mon: remove timeout support from mon::Client::authenticate()

as the timeout parameter is not used by OSD.

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

diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc
index ab8e53ce8544..8dbebf7664f1 100644
--- a/src/crimson/mon/MonClient.cc
+++ b/src/crimson/mon/MonClient.cc
@@ -466,11 +466,9 @@ seastar::future<> Client::build_initial_map()
   return monmap.build_initial(ceph::common::local_conf());
 }
 
-seastar::future<> Client::authenticate(std::chrono::seconds seconds)
+seastar::future<> Client::authenticate()
 {
-  return seastar::with_timeout(
-    seastar::lowres_clock::now() + seconds,
-    reopen_session(-1));
+  return reopen_session(-1);
 }
 
 seastar::future<> Client::stop()
diff --git a/src/crimson/mon/MonClient.h b/src/crimson/mon/MonClient.h
index ed94a4812a86..cc291f7510ad 100644
--- a/src/crimson/mon/MonClient.h
+++ b/src/crimson/mon/MonClient.h
@@ -71,7 +71,7 @@ public:
   ~Client();
   seastar::future<> load_keyring();
   seastar::future<> build_initial_map();
-  seastar::future<> authenticate(std::chrono::seconds seconds);
+  seastar::future<> authenticate();
   seastar::future<> stop();
   get_version_t get_version(const std::string& map);
   command_result_t run_command(const std::vector<std::string>& cmd,
diff --git a/src/test/crimson/test_monc.cc b/src/test/crimson/test_monc.cc
index 0df9b13791a3..a2b76421f1f6 100644
--- a/src/test/crimson/test_monc.cc
+++ b/src/test/crimson/test_monc.cc
@@ -39,7 +39,9 @@ static seastar::future<> test_monc()
         }).then([&msgr, &monc] {
           return msgr.start(&monc);
         }).then([&monc] {
-          return monc.authenticate(std::chrono::seconds{10});
+          return seastar::with_timeout(
+            seastar::lowres_clock::now() + std::chrono::seconds{10},
+            monc.authenticate());
         }).finally([&monc] {
           return monc.stop();
         });