Issue #2796 - Max local stream count exceeded when request fails.

Updates after review. Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
jetty · Oct 18, 2018 · 907e7af · 907e7af
1 parent ec2b5b1
commit 907e7af
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java b/jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java
@@ -763,6 +763,7 @@ protected IStream createLocalStream(int streamId)
             int localCount = localStreamCount.get();
             int maxCount = getMaxLocalStreams();
             if (maxCount >= 0 && localCount >= maxCount)
+                // TODO: remove the dump() in the exception message.
                 throw new IllegalStateException("Max local stream count " + maxCount + " exceeded" + System.lineSeparator() + dump());
             if (localStreamCount.compareAndSet(localCount, localCount + 1))
                 break;

diff --git a/...ent-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpChannelOverHTTP2.java b/...ent-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpChannelOverHTTP2.java
@@ -25,6 +25,7 @@
 import org.eclipse.jetty.client.HttpSender;
 import org.eclipse.jetty.client.api.Result;
 import org.eclipse.jetty.http2.ErrorCode;
+import org.eclipse.jetty.http2.IStream;
 import org.eclipse.jetty.http2.api.Session;
 import org.eclipse.jetty.http2.api.Stream;
 import org.eclipse.jetty.http2.frames.ResetFrame;
@@ -101,7 +102,7 @@ public void release()
         connection.release(this);
     }
 
-    void onStreamClosed(Stream stream)
+    void onStreamClosed(IStream stream)
     {
         connection.onStreamClosed(stream, this);
     }

diff --git a/...-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpConnectionOverHTTP2.java b/...-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpConnectionOverHTTP2.java
@@ -35,8 +35,8 @@
 import org.eclipse.jetty.client.SendFailure;
 import org.eclipse.jetty.http.HttpVersion;
 import org.eclipse.jetty.http2.ErrorCode;
+import org.eclipse.jetty.http2.IStream;
 import org.eclipse.jetty.http2.api.Session;
-import org.eclipse.jetty.http2.api.Stream;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
@@ -94,7 +94,6 @@ protected void release(HttpChannelOverHTTP2 channel)
     {
         if (LOG.isDebugEnabled())
             LOG.debug("Released {}", channel);
-        // Only non-push channels are released.
         if (activeChannels.remove(channel))
         {
             // Recycle only non-failed channels.
@@ -109,12 +108,14 @@ protected void release(HttpChannelOverHTTP2 channel)
         }
     }
 
-    void onStreamClosed(Stream stream, HttpChannelOverHTTP2 channel)
+    void onStreamClosed(IStream stream, HttpChannelOverHTTP2 channel)
     {
         if (LOG.isDebugEnabled())
             LOG.debug("{} closed for {}", stream, channel);
         channel.setStream(null);
-        getHttpDestination().release(this);
+        // Only non-push channels are released.
+        if (stream.isLocal())
+            getHttpDestination().release(this);
     }
 
     @Override

diff --git a/...nt-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpReceiverOverHTTP2.java b/...nt-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpReceiverOverHTTP2.java
@@ -38,6 +38,7 @@
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.http.MetaData;
 import org.eclipse.jetty.http2.ErrorCode;
+import org.eclipse.jetty.http2.IStream;
 import org.eclipse.jetty.http2.api.Stream;
 import org.eclipse.jetty.http2.frames.DataFrame;
 import org.eclipse.jetty.http2.frames.HeadersFrame;
@@ -187,7 +188,7 @@ public void onFailure(Stream stream, int error, String reason, Callback callback
     @Override
     public void onClosed(Stream stream)
     {
-        getHttpChannel().onStreamClosed(stream);
+        getHttpChannel().onStreamClosed((IStream)stream);
     }
 
     private void notifyContent(HttpExchange exchange, DataFrame frame, Callback callback)