Skip to content

Call initiating_close and delay delete_stream #3716

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

Closed
shinrich wants to merge 1 commit into from
Closed

Call initiating_close and delay delete_stream #3716

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions proxy/http2/Http2ConnectionState.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,7 +1128,7 @@ Http2ConnectionState::cleanup_streams()
if (this->tx_error_code.cls != ProxyErrorClass::NONE) {
s->set_tx_error_code(this->tx_error_code);
}
this->delete_stream(s);
s->initiating_close();
ink_assert(s != next);
s = next;
}
Expand Down Expand Up @@ -1182,8 +1182,8 @@ Http2ConnectionState::delete_stream(Http2Stream *stream)
ink_assert(client_streams_out_count > 0);
--client_streams_out_count;
}
// total_client_streams_count will be decremented in release_stream(), because it's a counter include streams in the process of
// shutting down.
// total_client_streams_count will be decremented in release_stream(), because that counter is used to determine
// whether it is safe to destroy the Session

stream->initiating_close();

Expand Down
2 changes: 1 addition & 1 deletion proxy/http2/Http2Stream.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ Http2Stream::initiating_close()
} else if (!sent_write_complete) {
// Transaction is already gone or not started. Kill yourself
do_io_close();
destroy();
transaction_done(); // Mark that it is safe to kill the stream
}
}
}
Expand Down