From bfe1a42c79938c47c96bf9b4e5ae15f02da98538 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 22 Sep 2020 14:09:40 +0800 Subject: [PATCH] crimson/mon: s/AuthResult/auth_result_t/ auth_result_t is merely an enum, so make it like so. Signed-off-by: Kefu Chai --- src/crimson/mon/MonClient.cc | 54 ++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc index 5c9d4279a04fa..2a51ffdb313d7 100644 --- a/src/crimson/mon/MonClient.cc +++ b/src/crimson/mon/MonClient.cc @@ -51,19 +51,19 @@ public: Connection(const AuthRegistry& auth_registry, crimson::net::ConnectionRef conn, KeyRing* keyring); - enum class AuthResult { + enum class auth_result_t { success = 0, failure, canceled }; seastar::future<> handle_auth_reply(Ref m); // v1 - seastar::future authenticate_v1( + seastar::future authenticate_v1( epoch_t epoch, const EntityName& name, uint32_t want_keys); // v2 - seastar::future authenticate_v2(); + seastar::future authenticate_v2(); auth::AuthClient::auth_request_t get_auth_request(const EntityName& name, uint32_t want_keys); @@ -99,8 +99,8 @@ private: rotating, general, }; - seastar::future> do_auth_single(request_t); - seastar::future do_auth(request_t); + seastar::future> do_auth_single(request_t); + seastar::future do_auth(request_t); private: bool closed = false; @@ -110,7 +110,7 @@ private: using clock_t = seastar::lowres_system_clock; clock_t::time_point auth_start; crimson::auth::method_t auth_method = 0; - seastar::promise auth_done; + seastar::promise auth_done; // v1 and v2 const AuthRegistry& auth_registry; crimson::net::ConnectionRef conn; @@ -141,8 +141,8 @@ seastar::future<> Connection::handle_auth_reply(Ref m) seastar::future<> Connection::renew_tickets() { if (auth->need_tickets()) { - return do_auth(request_t::general).then([](AuthResult r) { - if (r != AuthResult::success) { + return do_auth(request_t::general).then([](auth_result_t r) { + if (r != auth_result_t::success) { throw std::system_error( make_error_code( crimson::net::error::negotiation_failure)); @@ -166,8 +166,8 @@ seastar::future<> Connection::renew_rotating_keyring() return seastar::now(); } last_rotating_renew_sent = now; - return do_auth(request_t::rotating).then([](AuthResult r) { - if (r != AuthResult::success) { + return do_auth(request_t::rotating).then([](auth_result_t r) { + if (r != auth_result_t::success) { throw std::system_error(make_error_code( crimson::net::error::negotiation_failure)); } @@ -226,7 +226,7 @@ Connection::setup_session(epoch_t epoch, return conn->send(m); } -seastar::future> +seastar::future> Connection::do_auth_single(Connection::request_t what) { auto m = make_message(); @@ -254,8 +254,8 @@ Connection::do_auth_single(Connection::request_t what) if (!m) { ceph_assert(closed); logger().info("do_auth: connection closed"); - return seastar::make_ready_future>( - std::make_optional(AuthResult::canceled)); + return seastar::make_ready_future>( + std::make_optional(auth_result_t::canceled)); } logger().info( "do_auth: mon {} => {} returns {}: {}", @@ -270,24 +270,24 @@ Connection::do_auth_single(Connection::request_t what) ret, conn->get_peer_addr()); } - return seastar::make_ready_future>( + return seastar::make_ready_future>( ret == -EAGAIN ? std::nullopt : std::make_optional(ret == 0 - ? AuthResult::success - : AuthResult::failure + ? auth_result_t::success + : auth_result_t::failure )); }); } -seastar::future +seastar::future Connection::do_auth(Connection::request_t what) { return seastar::repeat_until_value([this, what]() { return do_auth_single(what); }); } -seastar::future +seastar::future Connection::authenticate_v1(epoch_t epoch, const EntityName& name, uint32_t want_keys) @@ -299,7 +299,7 @@ Connection::authenticate_v1(epoch_t epoch, }).then([name, want_keys, this](Ref m) { if (!m) { logger().error("authenticate_v1 canceled on {}", name); - return seastar::make_ready_future(AuthResult::canceled); + return seastar::make_ready_future(auth_result_t::canceled); } global_id = m->global_id; auth = create_auth(m->protocol, m->global_id, name, want_keys); @@ -308,7 +308,7 @@ Connection::authenticate_v1(epoch_t epoch, nullptr, nullptr)) { case 0: // none - return seastar::make_ready_future(AuthResult::success); + return seastar::make_ready_future(auth_result_t::success); case -EAGAIN: // cephx return do_auth(request_t::general); @@ -317,11 +317,11 @@ Connection::authenticate_v1(epoch_t epoch, } }).handle_exception([](auto ep) { logger().error("authenticate_v1 failed with {}", ep); - return seastar::make_ready_future(AuthResult::canceled); + return seastar::make_ready_future(auth_result_t::canceled); }); } -seastar::future Connection::authenticate_v2() +seastar::future Connection::authenticate_v2() { auth_start = seastar::lowres_system_clock::now(); return conn->send(make_message()).then([this] { @@ -397,7 +397,7 @@ Connection::handle_auth_done(uint64_t new_global_id, secret_t connection_secret; int r = auth->handle_response(0, p, &session_key, &connection_secret); conn->set_last_keepalive_ack(auth_start); - auth_done.set_value(AuthResult::success); + auth_done.set_value(auth_result_t::success); return {session_key, connection_secret, r}; } @@ -431,7 +431,7 @@ void Connection::close() { reply.set_value(Ref(nullptr)); reply = {}; - auth_done.set_value(AuthResult::canceled); + auth_done.set_value(auth_result_t::canceled); auth_done = {}; if (conn && !std::exchange(closed, true)) { conn->mark_down(); @@ -961,7 +961,7 @@ seastar::future<> Client::reopen_session(int rank) } logger().info("connecting to mon.{}", rank); return seastar::futurize_invoke( - [peer, this] () -> seastar::future { + [peer, this] () -> seastar::future { auto conn = msgr.connect(peer, CEPH_ENTITY_TYPE_MON); auto& mc = pending_conns.emplace_back( std::make_unique(auth_registry, conn, &keyring)); @@ -971,11 +971,11 @@ seastar::future<> Client::reopen_session(int rank) return mc->authenticate_v1(monmap.get_epoch(), entity_name, want_keys) .handle_exception([conn](auto ep) { conn->mark_down(); - return seastar::make_exception_future(ep); + return seastar::make_exception_future(ep); }); } }).then([peer, this](auto result) { - if (result != Connection::AuthResult::canceled) { + if (result != Connection::auth_result_t::canceled) { _finish_auth(peer); } logger().debug("reopen_session mon connection attempts complete"); -- 2.39.5