This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch 2.8.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/2.8.x by this push:
new a267b41e5 [SCB-2872]Fix idle timeout for read and write is not
properly set problem
a267b41e5 is described below
commit a267b41e5b0e7fdab52c95c1083cd7de44bc1e5c
Author: liubao68 <[email protected]>
AuthorDate: Mon Apr 15 10:50:14 2024 +0800
[SCB-2872]Fix idle timeout for read and write is not properly set problem
---
.../foundation/vertx/client/http/HttpClientOptionsSPI.java | 2 --
.../servicecomb/transport/rest/vertx/RestServerVerticle.java | 8 +-------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git
a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientOptionsSPI.java
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientOptionsSPI.java
index 14b5cbed1..7a483fe96 100644
---
a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientOptionsSPI.java
+++
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientOptionsSPI.java
@@ -108,8 +108,6 @@ public interface HttpClientOptionsSPI {
httpClientOptions.setProtocolVersion(spi.getHttpVersion());
httpClientOptions.setConnectTimeout(spi.getConnectTimeoutInMillis());
httpClientOptions.setIdleTimeout(spi.getIdleTimeoutInSeconds());
- httpClientOptions.setReadIdleTimeout(spi.getIdleTimeoutInSeconds());
- httpClientOptions.setWriteIdleTimeout(spi.getIdleTimeoutInSeconds());
httpClientOptions.setTryUseCompression(spi.isTryUseCompression());
httpClientOptions.setMaxWaitQueueSize(spi.getMaxWaitQueueSize());
httpClientOptions.setMaxPoolSize(spi.getMaxPoolSize());
diff --git
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
index 1ec8b1489..c9266b180 100644
---
a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
+++
b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java
@@ -68,14 +68,12 @@ public class RestServerVerticle extends AbstractVerticle {
private static final String SSL_KEY = "rest.provider";
- private Endpoint endpoint;
-
private URIEndpointObject endpointObject;
@Override
public void init(Vertx vertx, Context context) {
super.init(vertx, context);
- this.endpoint = (Endpoint)
context.config().getValue(AbstractTransport.ENDPOINT_KEY);
+ Endpoint endpoint = (Endpoint)
context.config().getValue(AbstractTransport.ENDPOINT_KEY);
this.endpointObject = (URIEndpointObject) endpoint.getAddress();
}
@@ -271,8 +269,6 @@ public class RestServerVerticle extends AbstractVerticle {
serverOptions.setUseAlpn(TransportConfig.getUseAlpn())
.setHttp2ConnectionWindowSize(TransportConfig.getHttp2ConnectionWindowSize())
.setIdleTimeout(TransportConfig.getHttp2ConnectionIdleTimeoutInSeconds())
-
.setReadIdleTimeout(TransportConfig.getHttp2ConnectionIdleTimeoutInSeconds())
-
.setWriteIdleTimeout(TransportConfig.getHttp2ConnectionIdleTimeoutInSeconds())
.setInitialSettings(new
Http2Settings().setPushEnabled(TransportConfig.getPushEnabled())
.setMaxConcurrentStreams(TransportConfig.getMaxConcurrentStreams())
.setHeaderTableSize(TransportConfig.getHttp2HeaderTableSize())
@@ -282,8 +278,6 @@ public class RestServerVerticle extends AbstractVerticle {
);
} else {
serverOptions.setIdleTimeout(TransportConfig.getConnectionIdleTimeoutInSeconds());
-
serverOptions.setReadIdleTimeout(TransportConfig.getConnectionIdleTimeoutInSeconds());
-
serverOptions.setWriteIdleTimeout(TransportConfig.getConnectionIdleTimeoutInSeconds());
}
if (endpointObject.isSslEnabled()) {
SSLOptionFactory factory =