RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-22 10:17:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/net: don't execute_open() if exception is thrown

Browse Source 
Signed-off-by: Yingxin <yingxin.cheng@intel.com>
This commit is contained in:
Yingxin 2018-11-22 05:35:10 +08:00
parent b22cf59c83
commit 1643f95791
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/crimson/net/SocketConnection.cc
View File

@ -808,7 +808,6 @@ SocketConnection::start_connect()
return seastar::repeat([this] { return seastar::repeat([this] {
return repeat_connect(); return repeat_connect();
}); });
// TODO: handle errors for state_t::connecting
}).then_wrapped([this] (auto fut) { }).then_wrapped([this] (auto fut) {
// satisfy the handshake's promise // satisfy the handshake's promise
fut.forward_to(std::move(h.promise)); fut.forward_to(std::move(h.promise));
@ -832,13 +831,11 @@ SocketConnection::connect(const entity_addr_t& _peer_addr,
return seastar::with_gate(messenger.pending_dispatch, [this] { return seastar::with_gate(messenger.pending_dispatch, [this] {
return dispatcher.ms_handle_connect(this); return dispatcher.ms_handle_connect(this);
}); });
}).handle_exception([this] (std::exception_ptr eptr) {
// close the connection before returning errors
return seastar::make_exception_future<>(eptr)
.finally([this] { close(); });
// TODO: retry on fault
}).then([this] { }).then([this] {
execute_open(); execute_open();
}).handle_exception([this] (std::exception_ptr eptr) {
// TODO: handle fault in the connecting state
close();
}); });
}); });
} }
@ -868,7 +865,6 @@ SocketConnection::start_accept()
return seastar::repeat([this] { return seastar::repeat([this] {
return repeat_handle_connect(); return repeat_handle_connect();
}); });
// TODO: handle errors for state_t::accepting
}).then_wrapped([this] (auto fut) { }).then_wrapped([this] (auto fut) {
// satisfy the handshake's promise // satisfy the handshake's promise
fut.forward_to(std::move(h.promise)); fut.forward_to(std::move(h.promise));
@ -892,12 +888,11 @@ SocketConnection::accept(seastar::connected_socket&& fd,
return seastar::with_gate(messenger.pending_dispatch, [=] { return seastar::with_gate(messenger.pending_dispatch, [=] {
return dispatcher.ms_handle_accept(this); return dispatcher.ms_handle_accept(this);
}); });
}).handle_exception([this] (std::exception_ptr eptr) {
// close the connection before returning errors
return seastar::make_exception_future<>(eptr)
.finally([this] { close(); });
}).then([this] { }).then([this] {
execute_open(); execute_open();
}).handle_exception([this] (std::exception_ptr eptr) {
// TODO: handle fault in the accepting state
close();
}); });
}); });
} }