Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "rpc stream: do not abort stream queue if stream connection was closed without error" #2618

Closed
wants to merge 1 commit into from
Closed

Revert "rpc stream: do not abort stream queue if stream connection was closed without error" #2618

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/rpc/rpc.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,9 +1021,9 @@ namespace rpc {
log_exception(*this, log_level::debug, "fail to connect", ep);
}
}
_stream_queue.abort(ep);
}
_error = true;
_stream_queue.abort(std::make_exception_ptr(stream_closed()));
return stop_send_loop(ep).then_wrapped([this] (future<> f) {
f.ignore_ready_future();
_outstanding.clear();
Expand Down Expand Up @@ -1242,10 +1242,10 @@ future<> server::connection::send_unknown_verb_reply(std::optional<rpc_clock_typ
ep = f.get_exception();
log_exception(*this, log_level::error,
format("server{} connection dropped", is_stream() ? " stream" : "").c_str(), ep);
_stream_queue.abort(ep);
}
_fd.shutdown_input();
_error = true;
_stream_queue.abort(std::make_exception_ptr(stream_closed()));
return stop_send_loop(ep).then_wrapped([this] (future<> f) {
f.ignore_ready_future();
get_server()._conns.erase(get_connection_id());
Expand Down
Loading