From 36fb31867f63cc236ee584b645dff1c25e72b8d5 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 17 Oct 2018 19:38:30 +0800 Subject: [PATCH] crimson/mon: remove timeout support from mon::Client::authenticate() as the timeout parameter is not used by OSD. Signed-off-by: Kefu Chai --- src/crimson/mon/MonClient.cc | 6 ++---- src/crimson/mon/MonClient.h | 2 +- src/test/crimson/test_monc.cc | 4 +++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc index ab8e53ce854..8dbebf7664f 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 ed94a4812a8..cc291f7510a 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& cmd, diff --git a/src/test/crimson/test_monc.cc b/src/test/crimson/test_monc.cc index 0df9b13791a..a2b76421f1f 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(); }); -- 2.47.3