(dubbo) branch 3.2 updated: fix:tcp connection window size split from stream connection window size (#14664)

[oxsean]

This is an automated email from the ASF dual-hosted git repository.

oxsean pushed a commit to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/3.2 by this push:
     new ddb3fba7d0 fix:tcp connection window size split from stream connection 
window size (#14664)
ddb3fba7d0 is described below

commit ddb3fba7d0f8b58090e98e5ad92de2d8c7f79ae8
Author: Liujunjie <42363259+junjieliu51...@users.noreply.github.com>
AuthorDate: Fri Sep 13 10:36:22 2024 +0800

    fix:tcp connection window size split from stream connection window size 
(#14664)
---
 .../src/main/java/org/apache/dubbo/rpc/Constants.java          |  1 +
 .../dubbo/rpc/protocol/tri/TriHttp2RemoteFlowController.java   | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java
index e660ae1634..dd656bc013 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Constants.java
@@ -102,6 +102,7 @@ public interface Constants {
     String H2_SETTINGS_ENABLE_PUSH_KEY = "dubbo.rpc.tri.enable-push";
     String H2_SETTINGS_MAX_CONCURRENT_STREAMS_KEY = 
"dubbo.rpc.tri.max-concurrent-streams";
     String H2_SETTINGS_INITIAL_WINDOW_SIZE_KEY = 
"dubbo.rpc.tri.initial-window-size";
+    String H2_SETTINGS_CONNECTION_INITIAL_WINDOW_SIZE_KEY = 
"dubbo.rpc.tri.connection-initial-window-size";
     String H2_SETTINGS_MAX_FRAME_SIZE_KEY = "dubbo.rpc.tri.max-frame-size";
     String H2_SETTINGS_MAX_HEADER_LIST_SIZE_KEY = 
"dubbo.rpc.tri.max-header-list-size";
 
diff --git 
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TriHttp2RemoteFlowController.java
 
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TriHttp2RemoteFlowController.java
index aa5339317d..161cfdd317 100644
--- 
a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TriHttp2RemoteFlowController.java
+++ 
b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TriHttp2RemoteFlowController.java
@@ -20,6 +20,9 @@ import org.apache.dubbo.common.config.Configuration;
 import org.apache.dubbo.common.config.ConfigurationUtils;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
+import java.util.ArrayDeque;
+import java.util.Deque;
+
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http2.Http2Connection;
 import io.netty.handler.codec.http2.Http2ConnectionAdapter;
@@ -34,9 +37,6 @@ import io.netty.util.internal.UnstableApi;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
-import java.util.ArrayDeque;
-import java.util.Deque;
-
 import static io.netty.handler.codec.http2.Http2CodecUtil.DEFAULT_WINDOW_SIZE;
 import static io.netty.handler.codec.http2.Http2CodecUtil.MAX_WEIGHT;
 import static io.netty.handler.codec.http2.Http2CodecUtil.MIN_WEIGHT;
@@ -49,7 +49,7 @@ import static io.netty.util.internal.ObjectUtil.checkNotNull;
 import static io.netty.util.internal.ObjectUtil.checkPositiveOrZero;
 import static java.lang.Math.max;
 import static java.lang.Math.min;
-import static 
org.apache.dubbo.rpc.Constants.H2_SETTINGS_INITIAL_WINDOW_SIZE_KEY;
+import static 
org.apache.dubbo.rpc.Constants.H2_SETTINGS_CONNECTION_INITIAL_WINDOW_SIZE_KEY;
 
 /**
  * This design is learning from {@see 
io.netty.handler.codec.http2.DefaultHttp2RemoteFlowController} which is in 
Netty.
@@ -89,7 +89,7 @@ public class TriHttp2RemoteFlowController implements 
Http2RemoteFlowController {
         this.connection = checkNotNull(connection, "connection");
         this.streamByteDistributor = checkNotNull(streamByteDistributor, 
"streamWriteDistributor");
         this.config = 
ConfigurationUtils.getGlobalConfiguration(applicationModel);
-        this.initialWindowSize = 
config.getInt(H2_SETTINGS_INITIAL_WINDOW_SIZE_KEY, DEFAULT_WINDOW_SIZE);
+        this.initialWindowSize = 
config.getInt(H2_SETTINGS_CONNECTION_INITIAL_WINDOW_SIZE_KEY, 
DEFAULT_WINDOW_SIZE);
 
         // Add a flow state for the connection.
         stateKey = connection.newKey();