RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/net: isolate exceptions from dispatcher implementations

Browse Source 
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
This commit is contained in:
Yingxin Cheng 2020-11-27 11:30:40 +08:00
parent bc140cf5d7
commit f4b40cddc1
3 changed files with 63 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/crimson/net/Protocol.cc
View File

@ -73,14 +73,9 @@ void Protocol::close(bool dispatch_reset,
auto gate_closed = gate.close();
if (dispatch_reset) {
try {
dispatcher->ms_handle_reset(
seastar::static_pointer_cast<SocketConnection>(conn.shared_from_this()),
is_replace);
} catch (...) {
logger().error("{} got unexpected exception in ms_handle_reset() {}",
conn, std::current_exception());
}
dispatcher->ms_handle_reset(
seastar::static_pointer_cast<SocketConnection>(conn.shared_from_this()),
is_replace);
}
// asynchronous operations

21
src/crimson/net/ProtocolV1.cc
View File

@ -874,12 +874,9 @@ seastar::future<> ProtocolV1::read_message()
return;
}
// start dispatch, ignoring exceptions from the application layer
gate.dispatch_in_background("ms_dispatch", *this, [this, msg = std::move(msg_ref)] {
logger().debug("{} <== #{} === {} ({})",
conn, msg->get_seq(), *msg, msg->get_type());
return dispatcher->ms_dispatch(&conn, std::move(msg));
});
logger().debug("{} <== #{} === {} ({})",
conn, msg_ref->get_seq(), *msg_ref, msg_ref->get_type());
std::ignore = dispatcher->ms_dispatch(&conn, std::move(msg_ref));
});
}
@ -919,15 +916,11 @@ void ProtocolV1::execute_open(open_t type)
set_write_state(write_state_t::open);
if (type == open_t::connected) {
gate.dispatch_in_background("ms_handle_connect", *this, [this] {
return dispatcher->ms_handle_connect(
seastar::static_pointer_cast<SocketConnection>(conn.shared_from_this()));
});
dispatcher->ms_handle_connect(
seastar::static_pointer_cast<SocketConnection>(conn.shared_from_this()));
} else { // type == open_t::accepted
gate.dispatch_in_background("ms_handle_accept", *this, [this] {
return dispatcher->ms_handle_accept(
seastar::static_pointer_cast<SocketConnection>(conn.shared_from_this()));
});
dispatcher->ms_handle_accept(
seastar::static_pointer_cast<SocketConnection>(conn.shared_from_this()));
}
gate.dispatch_in_background("execute_open", *this, [this] {

64
src/crimson/net/chained_dispatchers.cc
View File

@ -1,39 +1,81 @@
#include "crimson/common/log.h"
#include "crimson/net/chained_dispatchers.h"
#include "crimson/net/Connection.h"
#include "msg/Message.h"
namespace {
seastar::logger& logger() {
return crimson::get_logger(ceph_subsys_ms);
}
}
seastar::future<>
ChainedDispatchers::ms_dispatch(crimson::net::Connection* conn,
MessageRef m) {
return seastar::do_for_each(dispatchers, [conn, m](Dispatcher& dispatcher) {
return dispatcher.ms_dispatch(conn, m);
});
try {
return seastar::do_for_each(dispatchers, [conn, m](Dispatcher& dispatcher) {
return dispatcher.ms_dispatch(conn, m);
}).handle_exception([conn] (std::exception_ptr eptr) {
logger().error("{} got unexpected exception in ms_dispatch() throttling {}",
*conn, eptr);
ceph_abort();
});
} catch (...) {
logger().error("{} got unexpected exception in ms_dispatch() {}",
*conn, std::current_exception());
ceph_abort();
return seastar::now();
}
}
void
ChainedDispatchers::ms_handle_accept(crimson::net::ConnectionRef conn) {
for (auto& dispatcher : dispatchers) {
dispatcher.ms_handle_accept(conn);
try {
for (auto& dispatcher : dispatchers) {
dispatcher.ms_handle_accept(conn);
}
} catch (...) {
logger().error("{} got unexpected exception in ms_handle_accept() {}",
*conn, std::current_exception());
ceph_abort();
}
}
void
ChainedDispatchers::ms_handle_connect(crimson::net::ConnectionRef conn) {
for(auto& dispatcher : dispatchers) {
dispatcher.ms_handle_connect(conn);
try {
for(auto& dispatcher : dispatchers) {
dispatcher.ms_handle_connect(conn);
}
} catch (...) {
logger().error("{} got unexpected exception in ms_handle_connect() {}",
*conn, std::current_exception());
ceph_abort();
}
}
void
ChainedDispatchers::ms_handle_reset(crimson::net::ConnectionRef conn, bool is_replace) {
for (auto& dispatcher : dispatchers) {
dispatcher.ms_handle_reset(conn, is_replace);
try {
for (auto& dispatcher : dispatchers) {
dispatcher.ms_handle_reset(conn, is_replace);
}
} catch (...) {
logger().error("{} got unexpected exception in ms_handle_reset() {}",
*conn, std::current_exception());
ceph_abort();
}
}
void
ChainedDispatchers::ms_handle_remote_reset(crimson::net::ConnectionRef conn) {
for (auto& dispatcher : dispatchers) {
dispatcher.ms_handle_remote_reset(conn);
try {
for (auto& dispatcher : dispatchers) {
dispatcher.ms_handle_remote_reset(conn);
}
} catch (...) {
logger().error("{} got unexpected exception in ms_handle_remote_reset() {}",
*conn, std::current_exception());
ceph_abort();
}
}