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 ab8e53ce8544e02ceaab4a28c69392484dc60fa4..8dbebf7664f124dbbe8acd0c87e730cf428a1ae6 100644 (file)
--- 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 ed94a4812a862ae4fe0214db2586bb86f47aadfa..cc291f7510ad9c312823da976d024cce3be150a7 100644 (file)
--- 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 0df9b13791a3890276b39ea4d557e5afe194a25f..a2b76421f1f65a15d824bb901a26f5a2d2c38f59 100644 (file)
--- 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();
         });