RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
as the timeout parameter is not used by OSD.

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2018-10-17 19:38:30 +08:00
parent 250fe6bc0f
commit 36fb31867f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/crimson/mon/MonClient.cc
View File

@ -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()

2
src/crimson/mon/MonClient.h
View File

@ -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,

4
src/test/crimson/test_monc.cc
View File

@ -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();
});