Skip to content

http2: fix responses to long payload reqs #20084

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
apapirovski wants to merge 5 commits into from
+279 −105
Closed

http2: fix responses to long payload reqs #20084

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f3d2a7
http2: fix responses to long payload reqs
apapirovski Apr 16, 2018
d444e50
fixup: further refine the close logic
apapirovski Apr 23, 2018
08fa98c
fixup: account for destroy before connect
apapirovski Apr 23, 2018
51adabe
fixup: make test less brittle
apapirovski Apr 23, 2018
21f0e82
fixup: clear storage early
apapirovski Apr 28, 2018
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
Prev Previous commit
fixup: clear storage early
  • Loading branch information
@apapirovski
apapirovski committed Apr 28, 2018
commit 21f0e82e77052e5416d0c435385f0dbc18f3109c
3 changes: 2 additions & 1 deletion src/node_http2.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,14 +1366,15 @@ void Http2Session::ClearOutgoing(int status) {
CHECK_NE(flags_ & SESSION_STATE_SENDING, 0);

if (outgoing_buffers_.size() > 0) {
outgoing_storage_.clear();

for (const nghttp2_stream_write& wr : outgoing_buffers_) {
WriteWrap* wrap = wr.req_wrap;
if (wrap != nullptr)
wrap->Done(status);
}

outgoing_buffers_.clear();
outgoing_storage_.clear();
}

flags_ &= ~SESSION_STATE_SENDING;
Copy link
Copy Markdown
Member

@addaleax addaleax Apr 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I know, out streams implementation would typically send data that has buffered up on the writable side from within the wrap->Done() callback… it’s probably worth checking the benchmarks here

Copy link
Copy Markdown
Contributor Author

@apapirovski apapirovski Apr 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

h2load is still not installed on the CI. :( I can try on my machine but I find all the network benchmarks pretty unreliable on Macs.

Copy link
Copy Markdown
Contributor Author

@apapirovski apapirovski Apr 28, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I managed to run these on a separate machine on DO. No regressions that I could see...

Expand Down