Author: markt
Date: Fri Aug 21 13:14:05 2015
New Revision: 1696967
URL: http://svn.apache.org/r1696967
Log:
Improve debug message.
Correct pruning logic
Modified:
tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1696967&r1=1696966&r2=1696967&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Fri Aug
21 13:14:05 2015
@@ -775,6 +775,12 @@ public class Http2UpgradeHandler extends
// RFC 7540, 5.3.4 endpoints should maintain state for at least the
// maximum number of concurrent streams
long max = localSettings.getMaxConcurrentStreams();
+
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("upgradeHandler.pruneStart", connectionId,
+ Long.toString(max), Integer.toString(streams.size())));
+ }
+
// Allow an additional 10% for closed streams that are used in the
// priority tree
max = max + max / 10;
@@ -782,12 +788,7 @@ public class Http2UpgradeHandler extends
max = Integer.MAX_VALUE;
}
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.pruneStart", connectionId,
- Long.toString(max), Integer.toString(streams.size())));
- }
-
- int toClose = (int) max - streams.size();
+ int toClose = streams.size() - (int) max;
if (toClose < 1) {
return;
}
Modified: tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties?rev=1696967&r1=1696966&r2=1696967&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/coyote/http2/LocalStrings.properties Fri Aug
21 13:14:05 2015
@@ -90,7 +90,7 @@ upgradeHandler.noNewStreams=Connection [
upgradeHandler.pause.entry=Connection [{0}] Pausing
upgradeHandler.pingFailed=Connection [{0}] Failed to send ping to client
upgradeHandler.pruneIncomplete=Connection [{0}] Failed to fully prune the
connection because streams were active / used in the priority tree. There are
[{0}] too many streams
-upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams.
Limit is [{1}] and there are currently [{2}] streams.
+upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams.
Limit is [{1}] + 10% and there are currently [{2}] streams.
upgradeHandler.pruned=Connection [{0}] Pruned completed stream [{1}]
upgradeHandler.prunedPriority=Connection [{0}] Pruned unused stream [{1}] that
may have been part of the priority tree
upgradeHandler.rst.debug=Connection [{0}], Stream [{1}], Error [{2}], RST
(closing stream)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
