Skip to content

[Fix](load) Fix the channel leak when close wait has been cancelled #38031 #38186

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

Merged
dataroaring merged 1 commit into from
Jul 22, 2024
Merged

[Fix](load) Fix the channel leak when close wait has been cancelled #38031 #38186

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
14 changes: 6 additions & 8 deletions be/src/vec/sink/vtablet_sink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,12 +865,6 @@ bool VNodeChannel::is_send_data_rpc_done() const {

Status VNodeChannel::close_wait(RuntimeState* state) {
SCOPED_CONSUME_MEM_TRACKER(_node_channel_tracker.get());
// set _is_closed to true finally
Defer set_closed {[&]() {
std::lock_guard<std::mutex> l(_closed_lock);
_is_closed = true;
}};

auto st = none_of({_cancelled, !_eos_is_produced});
if (!st.ok()) {
if (_cancelled) {
Expand All @@ -891,8 +885,8 @@ Status VNodeChannel::close_wait(RuntimeState* state) {
}
_close_time_ms = UnixMillis() - _close_time_ms;

if (_cancelled || state->is_cancelled()) {
cancel(state->cancel_reason());
if (state->is_cancelled()) {
_cancel_with_msg(state->cancel_reason());
}

if (_add_batches_finished) {
Expand All @@ -904,6 +898,10 @@ Status VNodeChannel::close_wait(RuntimeState* state) {
_index_channel->set_error_tablet_in_state(state);
_index_channel->set_tablets_received_rows(_tablets_received_rows, _node_id);
_index_channel->set_tablets_filtered_rows(_tablets_filtered_rows, _node_id);
std::lock_guard<std::mutex> l(_closed_lock);
// only when normal close, we set _is_closed to true.
// otherwise, we will set it to true in cancel().
_is_closed = true;
return Status::OK();
}

Expand Down