Skip to content

Dispose streams that don't fit in pool #30995

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
2 commits merged into from
Mar 17, 2021
Merged

Dispose streams that don't fit in pool #30995

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1de6f5
Dispose streams that don't fit in pool
JamesNK Mar 17, 2021
f20ce1d
PR feedback
JamesNK Mar 17, 2021
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
26 changes: 9 additions & 17 deletions src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,21 +668,6 @@ private Http2StreamContext CreateHttp2StreamContext()
return streamContext;
}

private void ReturnStream(Http2Stream stream)
{
// We're conservative about what streams we can reuse.
// If there is a chance the stream is still in use then don't attempt to reuse it.
Debug.Assert(stream.CanReuse);

if (StreamPool.Count < MaxStreamPoolSize)
{
// This property is used to remove unused streams from the pool
stream.DrainExpirationTicks = SystemClock.UtcNowTicks + StreamPoolExpiryTicks;

StreamPool.Push(stream);
}
}

private Task ProcessPriorityFrameAsync()
{
if (_currentHeadersStream != null)
Expand Down Expand Up @@ -1181,12 +1166,19 @@ private void UpdateCompletedStreams()
private void RemoveStream(Http2Stream stream)
{
_streams.Remove(stream.StreamId);
if (stream.CanReuse)

if (stream.CanReuse && StreamPool.Count < MaxStreamPoolSize)
{
ReturnStream(stream);
// Pool and reuse the stream if it finished in a graceful state and there is space in the pool.

// This property is used to remove unused streams from the pool
stream.DrainExpirationTicks = SystemClock.UtcNowTicks + StreamPoolExpiryTicks;

StreamPool.Push(stream);
}
else
{
// Stream didn't complete gracefully or pool is full.
stream.Dispose();
}
}
Expand Down