Does not override defaults max stream size

apache · Sep 29, 2024 · 3110c80 · 3110c80
1 parent ceaea12
commit 3110c80
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/nested/ServletConfig.java b/dubbo-common/src/main/java/org/apache/dubbo/config/nested/ServletConfig.java
@@ -31,7 +31,8 @@ public class ServletConfig implements Serializable {
     /**
      * Maximum concurrent streams.
      * <p>For HTTP/2
-     * <p>The default value is {@link Integer#MAX_VALUE}.
+     * <p>Note that the default value for tomcat is 20. Highly recommended to change it to {@link Integer#MAX_VALUE}
+     * <p>If set to a negative number, the actual value will be set to {@link Integer#MAX_VALUE}.
      */
     private Integer maxConcurrentStreams;
 

diff --git a/...c/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboTriple3AutoConfiguration.java b/...c/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboTriple3AutoConfiguration.java
@@ -44,7 +44,7 @@ public class DubboTriple3AutoConfiguration {
     @Configuration(proxyBeanMethods = false)
     @ConditionalOnClass(Filter.class)
     @ConditionalOnWebApplication(type = Type.SERVLET)
-    @ConditionalOnProperty(prefix = PREFIX, name = "enabled")
+    @ConditionalOnProperty(prefix = PREFIX, name = "enabled", havingValue = "true")
     public static class TripleServletConfiguration {
 
         @Bean
@@ -62,15 +62,17 @@ public FilterRegistrationBean<TripleFilter> tripleProtocolFilter(
 
         @Bean
         @ConditionalOnClass(Http2Protocol.class)
-        WebServerFactoryCustomizer<ConfigurableTomcatWebServerFactory> tripleTomcatHttp2Customizer(
-                @Value("${" + PREFIX + ".max-concurrent-streams:2147483647}") int maxConcurrentStreams) {
+        @ConditionalOnProperty(prefix = PREFIX, name = "max-concurrent-streams")
+        public WebServerFactoryCustomizer<ConfigurableTomcatWebServerFactory> tripleTomcatHttp2Customizer(
+                @Value("${" + PREFIX + ".max-concurrent-streams}") int maxConcurrentStreams) {
             return factory -> factory.addConnectorCustomizers(connector -> {
                 ProtocolHandler handler = connector.getProtocolHandler();
                 for (UpgradeProtocol upgradeProtocol : handler.findUpgradeProtocols()) {
                     if (upgradeProtocol instanceof Http2Protocol) {
                         Http2Protocol protocol = (Http2Protocol) upgradeProtocol;
-                        protocol.setMaxConcurrentStreams(maxConcurrentStreams);
-                        protocol.setMaxConcurrentStreamExecution(maxConcurrentStreams);
+                        int value = maxConcurrentStreams <= 0 ? Integer.MAX_VALUE : maxConcurrentStreams;
+                        protocol.setMaxConcurrentStreams(value);
+                        protocol.setMaxConcurrentStreamExecution(value);
                     }
                 }
             });

diff --git a/...rc/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboTripleAutoConfiguration.java b/...rc/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboTripleAutoConfiguration.java
@@ -45,7 +45,7 @@ public class DubboTripleAutoConfiguration {
     @Configuration(proxyBeanMethods = false)
     @ConditionalOnClass(Filter.class)
     @ConditionalOnWebApplication(type = Type.SERVLET)
-    @ConditionalOnProperty(prefix = PREFIX, name = "enabled")
+    @ConditionalOnProperty(prefix = PREFIX, name = "enabled", havingValue = "true")
     public static class TripleServletConfiguration {
 
         @Bean
@@ -63,15 +63,17 @@ public FilterRegistrationBean<TripleFilter> tripleProtocolFilter(
 
         @Bean
         @ConditionalOnClass(Http2Protocol.class)
-        WebServerFactoryCustomizer<ConfigurableTomcatWebServerFactory> tripleTomcatHttp2Customizer(
-                @Value("${" + PREFIX + ".max-concurrent-streams:2147483647}") int maxConcurrentStreams) {
+        @ConditionalOnProperty(prefix = PREFIX, name = "max-concurrent-streams")
+        public WebServerFactoryCustomizer<ConfigurableTomcatWebServerFactory> tripleTomcatHttp2Customizer(
+                @Value("${" + PREFIX + ".max-concurrent-streams}") int maxConcurrentStreams) {
             return factory -> factory.addConnectorCustomizers(connector -> {
                 ProtocolHandler handler = connector.getProtocolHandler();
                 for (UpgradeProtocol upgradeProtocol : handler.findUpgradeProtocols()) {
                     if (upgradeProtocol instanceof Http2Protocol) {
                         Http2Protocol protocol = (Http2Protocol) upgradeProtocol;
-                        protocol.setMaxConcurrentStreams(maxConcurrentStreams);
-                        protocol.setMaxConcurrentStreamExecution(maxConcurrentStreams);
+                        int value = maxConcurrentStreams <= 0 ? Integer.MAX_VALUE : maxConcurrentStreams;
+                        protocol.setMaxConcurrentStreams(value);
+                        protocol.setMaxConcurrentStreamExecution(value);
                     }
                 }
             });