You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by gu...@apache.org on 2021/09/09 02:59:03 UTC
[dubbo] branch 3.0 updated: rename rpc h2 settings key (#8730)
This is an automated email from the ASF dual-hosted git repository.
guohao pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 13a1e8b rename rpc h2 settings key (#8730)
13a1e8b is described below
commit 13a1e8b6649e2a8a34503bd96c99dc7efcd53d1e
Author: ukuz90 <zh...@gmail.com>
AuthorDate: Thu Sep 9 10:58:45 2021 +0800
rename rpc h2 settings key (#8730)
* #8685 supported to configure HTTP2 settings
* #8685 rename h2 settings key
---
.../src/main/java/org/apache/dubbo/rpc/Constants.java | 12 ++++++------
.../apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java | 5 +++--
2 files changed, 9 insertions(+), 8 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 975f9bf..dbdf11a 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
@@ -95,10 +95,10 @@ public interface Constants {
String INVOCATION_KEY = "invocation";
String SERIALIZATION_ID_KEY = "serialization_id";
- String H2_SETTINGS_HEADER_TABLE_SIZE_KEY = "h2.settings.header-table-size";
- String H2_SETTINGS_ENABLE_PUSH_KEY = "h2.settings.enable-push";
- String H2_SETTINGS_MAX_CONCURRENT_STREAMS_KEY = "h2.settings.max-concurrent-streams";
- String H2_SETTINGS_INITIAL_WINDOW_SIZE_KEY = "h2.settings.initial-window-size";
- String H2_SETTINGS_MAX_FRAME_SIZE_KEY = "h2.settings.max-frame-size";
- String H2_SETTINGS_MAX_HEADER_LIST_SIZE_KEY = "h2.settings.max-header-list-size";
+ String H2_SETTINGS_HEADER_TABLE_SIZE_KEY = "dubbo.rpc.tri.header-table-size";
+ 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_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/TripleHttp2Protocol.java b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java
index ccecde3..aa1d495 100644
--- a/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java
+++ b/dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/TripleHttp2Protocol.java
@@ -20,6 +20,7 @@ import org.apache.dubbo.common.config.Configuration;
import org.apache.dubbo.common.config.ConfigurationUtils;
import org.apache.dubbo.common.extension.Activate;
import org.apache.dubbo.remoting.api.Http2WireProtocol;
+import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.FrameworkModel;
import org.apache.dubbo.rpc.model.ScopeModelAware;
@@ -55,7 +56,7 @@ public class TripleHttp2Protocol extends Http2WireProtocol implements ScopeModel
@Override
public void configServerPipeline(ChannelPipeline pipeline, SslContext sslContext) {
- final Configuration config = ConfigurationUtils.getGlobalConfiguration();
+ final Configuration config = ConfigurationUtils.getGlobalConfiguration(ApplicationModel.defaultModel());
final Http2FrameCodec codec = Http2FrameCodecBuilder.forServer()
.gracefulShutdownTimeoutMillis(10000)
.initialSettings(new Http2Settings()
@@ -78,7 +79,7 @@ public class TripleHttp2Protocol extends Http2WireProtocol implements ScopeModel
@Override
public void configClientPipeline(ChannelPipeline pipeline, SslContext sslContext) {
- final Configuration config = ConfigurationUtils.getGlobalConfiguration();
+ final Configuration config = ConfigurationUtils.getGlobalConfiguration(ApplicationModel.defaultModel());
final Http2FrameCodec codec = Http2FrameCodecBuilder.forClient()
.gracefulShutdownTimeoutMillis(10000)
.initialSettings(new Http2Settings()