Author: remm
Date: Thu Jun 23 19:34:03 2016
New Revision: 1749986
URL: http://svn.apache.org/viewvc?rev=1749986&view=rev
Log:
59706: Port stream concurrency control.
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 23 19:34:03 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747980,1747
993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749978,1749980
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501
,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747536,1747924,1747980,1747
993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java?rev=1749986&r1=1749985&r2=1749986&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2Protocol.java Thu
Jun 23 19:34:03 2016
@@ -35,6 +35,9 @@ public class Http2Protocol implements Up
static final long DEFAULT_WRITE_TIMEOUT = 10000;
// The HTTP/2 specification recommends a minimum default of 100
static final long DEFAULT_MAX_CONCURRENT_STREAMS = 200;
+ // Maximum amount of streams which can be concurrently executed over
+ // a single connection
+ static final int DEFAULT_MAX_CONCURRENT_STREAM_EXECUTION = 200;
// This default is defined by the HTTP/2 specification
static final int DEFAULT_INITIAL_WINDOW_SIZE = (1 << 16) - 1;
@@ -47,6 +50,7 @@ public class Http2Protocol implements Up
private long keepAliveTimeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
private long writeTimeout = DEFAULT_WRITE_TIMEOUT;
private long maxConcurrentStreams = DEFAULT_MAX_CONCURRENT_STREAMS;
+ private int maxConcurrentStreamExecution =
DEFAULT_MAX_CONCURRENT_STREAM_EXECUTION;
// If a lower initial value is required, set it here but DO NOT change the
// default defined above.
private int initialWindowSize = DEFAULT_INITIAL_WINDOW_SIZE;
@@ -87,6 +91,7 @@ public class Http2Protocol implements Up
result.setKeepAliveTimeout(getKeepAliveTimeout());
result.setWriteTimeout(getWriteTimeout());
result.setMaxConcurrentStreams(getMaxConcurrentStreams());
+
result.setMaxConcurrentStreamExecution(getMaxConcurrentStreamExecution());
result.setInitialWindowSize(getInitialWindowSize());
return result;
@@ -155,6 +160,16 @@ public class Http2Protocol implements Up
}
+ public int getMaxConcurrentStreamExecution() {
+ return maxConcurrentStreamExecution;
+ }
+
+
+ public void setMaxConcurrentStreamExecution(int
maxConcurrentStreamExecution) {
+ this.maxConcurrentStreamExecution = maxConcurrentStreamExecution;
+ }
+
+
public int getInitialWindowSize() {
return initialWindowSize;
}
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1749986&r1=1749985&r2=1749986&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
Thu Jun 23 19:34:03 2016
@@ -140,6 +140,10 @@ public class Http2UpgradeHandler extends
private final ConcurrentMap<AbstractStream,int[]> backLogStreams = new
ConcurrentHashMap<>();
private long backLogSize = 0;
+ // Stream concurrency control
+ private int maxConcurrentStreamExecution =
Http2Protocol.DEFAULT_MAX_CONCURRENT_STREAM_EXECUTION;
+ private AtomicInteger streamConcurrency = null;
+ private Queue<StreamProcessor> queuedProcessors = null;
public Http2UpgradeHandler(Adapter adapter, Request coyoteRequest) {
super (STREAM_ID_ZERO);
@@ -175,6 +179,12 @@ public class Http2UpgradeHandler extends
return;
}
+ // Init concurrency control if needed
+ if (maxConcurrentStreamExecution <
localSettings.getMaxConcurrentStreams()) {
+ streamConcurrency = new AtomicInteger(0);
+ queuedProcessors = new ConcurrentLinkedQueue<>();
+ }
+
parser = new Http2Parser(connectionId, this, this);
Stream stream = null;
@@ -243,7 +253,7 @@ public class Http2UpgradeHandler extends
if (webConnection != null) {
// Process the initial request on a container thread
- StreamProcessor streamProcessor = new StreamProcessor(stream,
adapter, socketWrapper);
+ StreamProcessor streamProcessor = new StreamProcessor(this,
stream, adapter, socketWrapper);
streamProcessor.setSslSupport(sslSupport);
socketWrapper.getEndpoint().getExecutor().execute(streamProcessor);
}
@@ -390,6 +400,33 @@ public class Http2UpgradeHandler extends
}
+ private int increaseStreamConcurrency() {
+ return streamConcurrency.incrementAndGet();
+ }
+
+ private int decreaseStreamConcurrency() {
+ return streamConcurrency.decrementAndGet();
+ }
+
+ private int getStreamConcurrency() {
+ return streamConcurrency.get();
+ }
+
+ void executeQueuedStream() {
+ if (streamConcurrency == null) {
+ return;
+ }
+ decreaseStreamConcurrency();
+ if (getStreamConcurrency() < maxConcurrentStreamExecution) {
+ StreamProcessor streamProcessor = queuedProcessors.poll();
+ if (streamProcessor != null) {
+ increaseStreamConcurrency();
+
socketWrapper.getEndpoint().getExecutor().execute(streamProcessor);
+ }
+ }
+ }
+
+
void sendStreamReset(StreamException se) throws IOException {
if (log.isDebugEnabled()) {
@@ -991,8 +1028,11 @@ public class Http2UpgradeHandler extends
pushStream.sentPushPromise();
// Process this stream on a container thread
- StreamProcessor streamProcessor = new StreamProcessor(pushStream,
adapter, socketWrapper);
+ StreamProcessor streamProcessor = new StreamProcessor(this,
pushStream, adapter, socketWrapper);
streamProcessor.setSslSupport(sslSupport);
+ if (streamConcurrency != null) {
+ increaseStreamConcurrency();
+ }
socketWrapper.getEndpoint().getExecutor().execute(streamProcessor);
}
@@ -1051,6 +1091,11 @@ public class Http2UpgradeHandler extends
}
+ public void setMaxConcurrentStreamExecution(int
maxConcurrentStreamExecution) {
+ this.maxConcurrentStreamExecution = maxConcurrentStreamExecution;
+ }
+
+
public void setInitialWindowSize(int initialWindowSize) {
localSettings.set(Setting.INITIAL_WINDOW_SIZE, initialWindowSize);
}
@@ -1220,9 +1265,18 @@ public class Http2UpgradeHandler extends
Stream stream = getStream(streamId,
connectionState.get().isNewStreamAllowed());
if (stream != null) {
// Process this stream on a container thread
- StreamProcessor streamProcessor = new StreamProcessor(stream,
adapter, socketWrapper);
+ StreamProcessor streamProcessor = new StreamProcessor(this,
stream, adapter, socketWrapper);
streamProcessor.setSslSupport(sslSupport);
- socketWrapper.getEndpoint().getExecutor().execute(streamProcessor);
+ if (streamConcurrency == null) {
+
socketWrapper.getEndpoint().getExecutor().execute(streamProcessor);
+ } else {
+ if (getStreamConcurrency() < maxConcurrentStreamExecution) {
+ increaseStreamConcurrency();
+
socketWrapper.getEndpoint().getExecutor().execute(streamProcessor);
+ } else {
+ queuedProcessors.offer(streamProcessor);
+ }
+ }
}
}
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java?rev=1749986&r1=1749985&r2=1749986&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/http2/StreamProcessor.java Thu
Jun 23 19:34:03 2016
@@ -43,13 +43,15 @@ public class StreamProcessor extends Abs
private static final Log log = LogFactory.getLog(StreamProcessor.class);
private static final StringManager sm =
StringManager.getManager(StreamProcessor.class);
+ private final Http2UpgradeHandler handler;
private final Stream stream;
private volatile SSLSupport sslSupport;
- public StreamProcessor(Stream stream, Adapter adapter,
SocketWrapperBase<?> socketWrapper) {
+ public StreamProcessor(Http2UpgradeHandler handler, Stream stream, Adapter
adapter, SocketWrapperBase<?> socketWrapper) {
super(stream.getCoyoteRequest(), stream.getCoyoteResponse());
+ this.handler = handler;
this.stream = stream;
setAdapter(adapter);
setSocketWrapper(socketWrapper);
@@ -57,36 +59,43 @@ public class StreamProcessor extends Abs
@Override
- public synchronized void run() {
- // HTTP/2 equivalent of AbstractConnectionHandler#process() without the
- // socket <-> processor mapping
- ContainerThreadMarker.set();
- SocketState state = SocketState.CLOSED;
+ public void run() {
try {
- state = process(socketWrapper, SocketEvent.OPEN_READ);
-
- if (state == SocketState.CLOSED) {
- if (!getErrorState().isConnectionIoAllowed()) {
+ // FIXME: the regular processor syncs on socketWrapper, but here
this deadlocks
+ synchronized (this) {
+ // HTTP/2 equivalent of AbstractConnectionHandler#process()
without the
+ // socket <-> processor mapping
+ ContainerThreadMarker.set();
+ SocketState state = SocketState.CLOSED;
+ try {
+ state = process(socketWrapper, SocketEvent.OPEN_READ);
+
+ if (state == SocketState.CLOSED) {
+ if (!getErrorState().isConnectionIoAllowed()) {
+ ConnectionException ce = new
ConnectionException(sm.getString(
+ "streamProcessor.error.connection",
stream.getConnectionId(),
+ stream.getIdentifier()),
Http2Error.INTERNAL_ERROR);
+ stream.close(ce);
+ } else if (!getErrorState().isIoAllowed()) {
+ StreamException se = new
StreamException(sm.getString(
+ "streamProcessor.error.stream",
stream.getConnectionId(),
+ stream.getIdentifier()),
Http2Error.INTERNAL_ERROR,
+ stream.getIdentifier().intValue());
+ stream.close(se);
+ }
+ }
+ } catch (Exception e) {
ConnectionException ce = new
ConnectionException(sm.getString(
"streamProcessor.error.connection",
stream.getConnectionId(),
stream.getIdentifier()),
Http2Error.INTERNAL_ERROR);
+ ce.initCause(e);
stream.close(ce);
- } else if (!getErrorState().isIoAllowed()) {
- StreamException se = new StreamException(sm.getString(
- "streamProcessor.error.stream",
stream.getConnectionId(),
- stream.getIdentifier()), Http2Error.INTERNAL_ERROR,
- stream.getIdentifier().intValue());
- stream.close(se);
+ } finally {
+ ContainerThreadMarker.clear();
}
}
- } catch (Exception e) {
- ConnectionException ce = new ConnectionException(sm.getString(
- "streamProcessor.error.connection",
stream.getConnectionId(),
- stream.getIdentifier()), Http2Error.INTERNAL_ERROR);
- ce.initCause(e);
- stream.close(ce);
} finally {
- ContainerThreadMarker.clear();
+ handler.executeQueuedStream();
}
}
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1749986&r1=1749985&r2=1749986&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Jun 23 19:34:03 2016
@@ -96,6 +96,12 @@
<bug>59233</bug>: Add the ability to add TLS virtual hosts dynamically.
(markt)
</add>
+ <update>
+ Add a <code>maxConcurrentStreamExecution</code> on the HTTP/2
+ protocol handler to allow restricting the amount of concurrent stream
+ that are being executed in a single connection. The default is to
+ not limit it. (remm)
+ </update>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
