Fix BZ 64467. Improve performance of closing idle streams

markt-asf · markt-asf · commit c8acd2ab7371 · 2020-05-22T11:41:14.000+01:00
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1582,11 +1582,11 @@ public HeaderEmitter headersStart(int streamId, boolean headersEndStream)
     }
 
 
-    private void closeIdleStreams(int newMaxActiveRemoteStreamId) throws Http2Exception {
-        for (int i = maxActiveRemoteStreamId + 2; i < newMaxActiveRemoteStreamId; i += 2) {
-            Stream stream = getStream(i, false);
-            if (stream != null) {
-                stream.closeIfIdle();
+    private void closeIdleStreams(int newMaxActiveRemoteStreamId) {
+        for (Entry<Integer,Stream> entry : streams.entrySet()) {
+            if (entry.getKey().intValue() > maxActiveRemoteStreamId &&
+                    entry.getKey().intValue() < newMaxActiveRemoteStreamId) {
+                entry.getValue().closeIfIdle();
             }
         }
         maxActiveRemoteStreamId = newMaxActiveRemoteStreamId;
diff --git a/test/org/apache/coyote/http2/TestHttp2Section_5_1.java b/test/org/apache/coyote/http2/TestHttp2Section_5_1.java
@@ -152,21 +152,44 @@ public void testClientSendOldStream() throws Exception {
 
     @Test
     public void testImplicitClose() throws Exception {
+        doTestImplicitClose(5);
+    }
+
+
+    // https://bz.apache.org/bugzilla/show_bug.cgi?id=64467
+    @Test
+    public void testImplicitCloseLargeId() throws Exception {
+        doTestImplicitClose(Integer.MAX_VALUE - 8);
+    }
+
+
+    private void doTestImplicitClose(int lastStreamId) throws Exception {
+
+        long startFirst = System.nanoTime();
         http2Connect();
+        long durationFirst = System.nanoTime() - startFirst;
 
         sendPriority(3, 0, 16);
-        sendPriority(5, 0, 16);
+        sendPriority(lastStreamId, 0, 16);
 
-        sendSimpleGetRequest(5);
+        long startSecond = System.nanoTime();
+        sendSimpleGetRequest(lastStreamId);
         readSimpleGetResponse();
-        Assert.assertEquals(getSimpleResponseTrace(5), output.getTrace());
+        long durationSecond = System.nanoTime() - startSecond;
+
+        Assert.assertEquals(getSimpleResponseTrace(lastStreamId), output.getTrace());
         output.clearTrace();
 
+        // Allow second request to take up to 5 times first request or up to 1 second - whichever is the larger - mainly
+        // to allow for CI systems under load that can exhibit significant timing variation.
+        Assert.assertTrue("First request took [" + durationFirst/1000000 + "ms], second request took [" +
+                durationSecond/1000000 + "ms]", durationSecond < 1000000000 || durationSecond < durationFirst * 3);
+
         // Should trigger an error since stream 3 should have been implicitly
         // closed.
         sendSimpleGetRequest(3);
 
-        handleGoAwayResponse(5);
+        handleGoAwayResponse(lastStreamId);
     }
 
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
@@ -63,6 +63,10 @@
       <update>
         Add support for ALPN on recent OpenJDK 8 releases. (remm)
       </update>
+      <fix>
+        <bug>64467</bug>: Improve performance of closing idle HTTP/2 streams.
+        (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="WebSocket">

Original file line number	Diff line number	Diff line change
`@@ -1582,11 +1582,11 @@ public HeaderEmitter headersStart(int streamId, boolean headersEndStream)`
`1582`	`1582`	`}`
`1583`	`1583`
`1584`	`1584`
`1585`		`- private void closeIdleStreams(int newMaxActiveRemoteStreamId) throws Http2Exception {`
`1586`		`- for (int i = maxActiveRemoteStreamId + 2; i < newMaxActiveRemoteStreamId; i += 2) {`
`1587`		`- Stream stream = getStream(i, false);`
`1588`		`- if (stream != null) {`
`1589`		`- stream.closeIfIdle();`
	`1585`	`+ private void closeIdleStreams(int newMaxActiveRemoteStreamId) {`
	`1586`	`+ for (Entry<Integer,Stream> entry : streams.entrySet()) {`
	`1587`	`+ if (entry.getKey().intValue() > maxActiveRemoteStreamId &&`
	`1588`	`+ entry.getKey().intValue() < newMaxActiveRemoteStreamId) {`
	`1589`	`+ entry.getValue().closeIfIdle();`
`1590`	`1590`	`}`
`1591`	`1591`	`}`
`1592`	`1592`	`maxActiveRemoteStreamId = newMaxActiveRemoteStreamId;`