Dispose streams that don't fit in pool (#30995)

* Dispose streams that don't fit in pool * PR feedback
dotnet · Mar 17, 2021 · 6adb596 · 6adb596
1 parent 8481b93
commit 6adb596
Showing 1 changed file with 9 additions and 17 deletions.
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs b/src/Servers/Kestrel/Core/src/Internal/Http2/Http2Connection.cs
@@ -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)
@@ -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();
             }
         }