Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2797 from eclipse/jetty-9.4.x-2796-max_concurrent_streams_local_timeout 

Fixes #2796 - Max local stream count exceeded when request fails.
This commit is contained in:
Simone Bordet 2018-08-14 16:21:03 +02:00 committed by GitHub
parent dd428b24a7 35541d0c1e
commit 03af18ca82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
jetty-http2/http2-http-client-transport/src/main/java/org/eclipse/jetty/http2/client/http/HttpChannelOverHTTP2.java
View File

@ -101,24 +101,22 @@ public class HttpChannelOverHTTP2 extends HttpChannel
connection.release(this);
}
@Override
public boolean abort(HttpExchange exchange, Throwable requestFailure, Throwable responseFailure)
{
Stream stream = getStream();
boolean aborted = super.abort(exchange, requestFailure, responseFailure);
if (aborted)
{
if (stream != null)
stream.reset(new ResetFrame(stream.getId(), ErrorCode.CANCEL_STREAM_ERROR.code), Callback.NOOP);
}
return aborted;
}
@Override
public void exchangeTerminated(HttpExchange exchange, Result result)
{
super.exchangeTerminated(exchange, result);
release();
if (result.isSucceeded())
{
release();
}
else
{
Stream stream = getStream();
if (stream != null)
stream.reset(new ResetFrame(stream.getId(), ErrorCode.CANCEL_STREAM_ERROR.code), new ReleaseCallback());
else
release();
}
}
@Override
@ -129,4 +127,27 @@ public class HttpChannelOverHTTP2 extends HttpChannel
sender,
receiver);
}
private class ReleaseCallback implements Callback
{
@Override
public void succeeded()
{
release();
}
@Override
public void failed(Throwable x)
{
if (LOG.isDebugEnabled())
LOG.debug(x);
release();
}
@Override
public InvocationType getInvocationType()
{
return InvocationType.NON_BLOCKING;
}
}
}

33
jetty-http2/http2-http-client-transport/src/test/java/org/eclipse/jetty/http2/client/http/MaxConcurrentStreamsTest.java
View File

@ -367,6 +367,39 @@ public class MaxConcurrentStreamsTest extends AbstractTest
Assert.assertTrue(failures.toString(), failures.isEmpty());
}
@Test
public void testTwoConcurrentStreamsFirstTimesOut() throws Exception
{
long timeout = 1000;
start(1, new EmptyServerHandler()
{
@Override
protected void service(String target, Request jettyRequest, HttpServletRequest request, HttpServletResponse response)
{
if (target.endsWith("/1"))
sleep(2 * timeout);
}
});
client.setMaxConnectionsPerDestination(1);
CountDownLatch latch = new CountDownLatch(1);
client.newRequest("localhost", connector.getLocalPort())
.path("/1")
.timeout(timeout, TimeUnit.MILLISECONDS)
.send(result ->
{
if (result.isFailed())
latch.countDown();
});
ContentResponse response2 = client.newRequest("localhost", connector.getLocalPort())
.path("/2")
.send();
Assert.assertEquals(HttpStatus.OK_200, response2.getStatus());
Assert.assertTrue(latch.await(2 * timeout, TimeUnit.MILLISECONDS));
}
private void primeConnection() throws Exception
{
// Prime the connection so that the maxConcurrentStream setting arrives to the client.