From: Yingxin Cheng Date: Tue, 16 Jul 2019 11:38:51 +0000 (+0800) Subject: crimson/net: abort with unhandled exceptions from dispatcher X-Git-Tag: v15.1.0~2161^2~10 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=917d70cf3cbfb8b1ba7a74e1fc2312cd842dd1b4;p=ceph.git crimson/net: abort with unhandled exceptions from dispatcher Signed-off-by: Yingxin Cheng --- diff --git a/src/crimson/net/ProtocolV2.cc b/src/crimson/net/ProtocolV2.cc index 99097e4f6f9..f919b2d6048 100644 --- a/src/crimson/net/ProtocolV2.cc +++ b/src/crimson/net/ProtocolV2.cc @@ -357,6 +357,7 @@ void ProtocolV2::dispatch_reset() seastar::static_pointer_cast(conn.shared_from_this())) .handle_exception([this] (std::exception_ptr eptr) { logger().error("{} ms_handle_reset caught exception: {}", conn, eptr); + ceph_abort("unexpected exception from ms_handle_reset()"); }); }); } @@ -383,6 +384,7 @@ void ProtocolV2::reset_session(bool full) seastar::static_pointer_cast(conn.shared_from_this())) .handle_exception([this] (std::exception_ptr eptr) { logger().error("{} ms_handle_remote_reset caught exception: {}", conn, eptr); + ceph_abort("unexpected exception from ms_handle_remote_reset()"); }); }); } @@ -680,6 +682,7 @@ seastar::future ProtocolV2::client_connect() seastar::static_pointer_cast(conn.shared_from_this())) .handle_exception([this] (std::exception_ptr eptr) { logger().error("{} ms_handle_connect caught exception: {}", conn, eptr); + ceph_abort("unexpected exception from ms_handle_connect()"); }); }).then([this] { return true; @@ -755,6 +758,7 @@ seastar::future ProtocolV2::client_reconnect() conn.shared_from_this())) .handle_exception([this] (std::exception_ptr eptr) { logger().error("{} ms_handle_connect caught exception: {}", conn, eptr); + ceph_abort("unexpected exception from ms_handle_connect()"); }); }).then([this] { return true; @@ -1326,6 +1330,7 @@ seastar::future<> ProtocolV2::send_server_ident() seastar::static_pointer_cast(conn.shared_from_this())) .handle_exception([this] (std::exception_ptr eptr) { logger().error("{} ms_handle_accept caught exception: {}", conn, eptr); + ceph_abort("unecpected exception from ms_handle_accept()"); }); }); @@ -1490,7 +1495,7 @@ seastar::future<> ProtocolV2::read_message(utime_t throttle_stamp) return dispatcher.ms_dispatch(&conn, std::move(msg)) .handle_exception([this] (std::exception_ptr eptr) { logger().error("{} ms_dispatch caught exception: {}", conn, eptr); - ceph_assert(false); + ceph_abort("unexpected exception from ms_dispatch()"); }); }); });