This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 60adb26 Update log message to align with code
60adb26 is described below
commit 60adb26e5ee4ed0343847cf82bd7b23a964c48ed
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 1 13:17:51 2021 +0000
Update log message to align with code
Pruning previously started at maxConcurrentStreams + 10% but was changed
to 5 * maxConcurrentStreams to meet the requirements of RFC 7540, page
20 to retain stream information for a 'significant' period of time.
---
java/org/apache/coyote/http2/Http2UpgradeHandler.java | 12 ++++++------
java/org/apache/coyote/http2/LocalStrings.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_fr.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_ko.properties | 2 +-
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 5db617f..1c52cce 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -1180,12 +1180,6 @@ public class Http2UpgradeHandler extends AbstractStream
implements InternalHttpU
// maximum number of concurrent streams.
long max = localSettings.getMaxConcurrentStreams();
- final int size = streams.size();
- if (log.isDebugEnabled()) {
- log.debug(sm.getString("upgradeHandler.pruneStart", connectionId,
- Long.toString(max), Integer.toString(size)));
- }
-
// Only need ~+10% for streams that are in the priority tree,
// Ideally need to retain information for a "significant" amount of
time
// after sending END_STREAM (RFC 7540, page 20) so we detect potential
@@ -1197,6 +1191,12 @@ public class Http2UpgradeHandler extends AbstractStream
implements InternalHttpU
max = Integer.MAX_VALUE;
}
+ final int size = streams.size();
+ if (log.isDebugEnabled()) {
+ log.debug(sm.getString("upgradeHandler.pruneStart", connectionId,
+ Long.toString(max), Integer.toString(size)));
+ }
+
int toClose = size - (int) max;
if (toClose < 1) {
return;
diff --git a/java/org/apache/coyote/http2/LocalStrings.properties
b/java/org/apache/coyote/http2/LocalStrings.properties
index c1e8c0a..1a006ae 100644
--- a/java/org/apache/coyote/http2/LocalStrings.properties
+++ b/java/org/apache/coyote/http2/LocalStrings.properties
@@ -130,7 +130,7 @@ upgradeHandler.pause.entry=Connection [{0}] Pausing
upgradeHandler.pingFailed=Connection [{0}] Failed to send ping to client
upgradeHandler.prefaceReceived=Connection [{0}], Connection preface received
from client
upgradeHandler.pruneIncomplete=Connection [{0}], Stream [{1}], Failed to fully
prune the connection because there are [{2}] too many active streams
-upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams.
Limit is [{1}] + 10% and there are currently [{2}] streams.
+upgradeHandler.pruneStart=Connection [{0}] Starting pruning of old streams.
Limit is [{1}] 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.releaseBacklog=Connection [{0}], Stream [{1}] released from
backlog
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 6348edc..e48bb6c 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -130,7 +130,7 @@ upgradeHandler.pause.entry=Connection [{0}] mise en pause
upgradeHandler.pingFailed=La connection [{0}] n''a pas réussi à envoyer un
ping au client
upgradeHandler.prefaceReceived=Connection [{0}], préface de la connection
recue du client
upgradeHandler.pruneIncomplete=Connexion [{0}], Flux [{1}], Erreur lors de
l''élimination complète de la connexion parce que des flux sont encore actifs /
utilisés dans l''arbre de priorité, il y a [{2}] flux en trop
-upgradeHandler.pruneStart=Connection [{0}] Début de l''élimination des anciens
flux, la limite est de [{1}] + 10 % et il y a actuellement [{2}] flux
+upgradeHandler.pruneStart=Connection [{0}] Début de l''élimination des anciens
flux, la limite est de [{1}] et il y a actuellement [{2}] flux
upgradeHandler.pruned=Connection [{0}] Elimination du flux terminé [{1}]
upgradeHandler.prunedPriority=La connexion [{0}] a élagué le flux inutilisé
[{1}] qui faisait peut-être partie de l''arbre de priorité
upgradeHandler.releaseBacklog=Connection [{0}], Flux [{1}] enlevée de la file
d''attente
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index aad68f0..58912da 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -130,7 +130,7 @@ upgradeHandler.pause.entry=연결 [{0}]이(가) 일시 정지 중
upgradeHandler.pingFailed=연결 [{0}]: 클라이언트에 ping 메시지를 보내지 못했습니다.
upgradeHandler.prefaceReceived=연결 [{0}]: 연결 preface를 클라이언트로부터 받았습니다.
upgradeHandler.pruneIncomplete=연결 [{0}]: 스트림들이 Priority tree에서 활성화되어 있거나 사용되고
있기 때문에, 해당 연결을 완전히 제거하지 못했습니다. 너무 많은 스트림들이 존재합니다: [{2}].
-upgradeHandler.pruneStart=연결 [{0}]: 이전 스트림들에 대한 가지치기를 시작합니다. 한계값은 [{1}] +
10%이고, 현재 [{2}]개의 스트림들이 존재합니다.
+upgradeHandler.pruneStart=연결 [{0}]: 이전 스트림들에 대한 가지치기를 시작합니다. 한계값은 [{1}] 이고, 현재
[{2}]개의 스트림들이 존재합니다.
upgradeHandler.pruned=연결 [{0}]이(가) 완료된 스트림 [{1}]을(를) 제거했습니다.
upgradeHandler.prunedPriority=연결 [{0}]이(가) 사용되지 않는 스트림 [{1}]을(를) 제거합니다. 해당
스트림은 priority tree의 일부였을 수 있습니다.
upgradeHandler.releaseBacklog=연결 [{0}], 스트림 [{1}]이(가) 백로그로부터 해제되었습니다.
diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index 2f54ef6..9c60072 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -128,7 +128,7 @@ upgradeHandler.pause.entry=连接[{0}]正在暂停
upgradeHandler.pingFailed=对客户端发送ping 链接失败.
upgradeHandler.prefaceReceived=连接[{0}]，从客户端收到连接准备。
upgradeHandler.pruneIncomplete=连接[{0}]，流[{1}]，无法完全修剪连接，因为有[{2}]个活动流太多
-upgradeHandler.pruneStart=连接[{0}]正在开始修剪旧流。限制为[{1}]+10%，当前有[{2}]个流。
+upgradeHandler.pruneStart=连接[{0}]正在开始修剪旧流。限制为[{1}]，当前有[{2}]个流。
upgradeHandler.pruned=连接[{0}]已修剪完成的流[{1}]
upgradeHandler.prunedPriority=连接[{0}]已经成为了属于优先级树中未使用的流[{1}]
upgradeHandler.releaseBacklog=连接[{0}]，流[{1}]已从待办事项列表中释放
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
