RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/mon: use switch case for checking return code

Browse Source 
also, since seastar supports returning plain value instead a ready
future, let's return plain value. simpler this way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2021-01-22 10:31:10 +08:00
parent 84b2e06794
commit 71229d557d
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,8 +254,7 @@ 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::optional<Connection::auth_result_t>>(
std::make_optional(auth_result_t::canceled));
return std::make_optional(auth_result_t::canceled);
}
logger().info(
"do_auth: mon {} => {} returns {}: {}",
@ -264,19 +263,22 @@ Connection::do_auth_single(Connection::request_t what)
auto p = m->result_bl.cbegin();
auto ret = auth->handle_response(m->result, p,
nullptr, nullptr);
if (ret != 0 && ret != -EAGAIN) {
std::optional<Connection::auth_result_t> auth_result;
switch (ret) {
case -EAGAIN:
auth_result = std::nullopt;
break;
case 0:
auth_result = auth_result_t::success;
break;
default:
auth_result = auth_result_t::failure;
logger().error(
"do_auth: got error {} on mon {}",
ret,
conn->get_peer_addr());
"do_auth: got error {} on mon {}",
ret, conn->get_peer_addr());
break;
}
return seastar::make_ready_future<std::optional<Connection::auth_result_t>>(
ret == -EAGAIN
? std::nullopt
: std::make_optional(ret == 0
? auth_result_t::success
: auth_result_t::failure
));
return auth_result;
});
}