Skip to content

Commit cb9c347

Browse files
authored
[SCB-2872]Fix idle timeout for read and write is not properly set problem (#4297)
1 parent 0479ea7 commit cb9c347

File tree

2 files changed

+2
-11
lines changed
  • foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http
  • transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx

2 files changed

+2
-11
lines changed

foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientOptionsSPI.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ static HttpClientOptions createHttpClientOptions(HttpClientOptionsSPI spi) {
103103
httpClientOptions.setProtocolVersion(spi.getHttpVersion());
104104
httpClientOptions.setConnectTimeout(spi.getConnectTimeoutInMillis());
105105
httpClientOptions.setIdleTimeout(spi.getIdleTimeoutInSeconds());
106-
httpClientOptions.setReadIdleTimeout(spi.getIdleTimeoutInSeconds());
107-
httpClientOptions.setWriteIdleTimeout(spi.getIdleTimeoutInSeconds());
108106
httpClientOptions.setTryUseCompression(spi.isTryUseCompression());
109107
httpClientOptions.setMaxWaitQueueSize(spi.getMaxWaitQueueSize());
110108
httpClientOptions.setMaxPoolSize(spi.getMaxPoolSize());

transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,12 @@ public class RestServerVerticle extends AbstractVerticle {
6767

6868
private static final String SSL_KEY = "rest.provider";
6969

70-
private Endpoint endpoint;
71-
7270
private URIEndpointObject endpointObject;
7371

7472
@Override
7573
public void init(Vertx vertx, Context context) {
7674
super.init(vertx, context);
77-
this.endpoint = (Endpoint) context.config().getValue(AbstractTransport.ENDPOINT_KEY);
75+
Endpoint endpoint = (Endpoint) context.config().getValue(AbstractTransport.ENDPOINT_KEY);
7876
this.endpointObject = (URIEndpointObject) endpoint.getAddress();
7977
}
8078

@@ -137,9 +135,8 @@ void mountGlobalRestFailureHandler(Router mainRouter) {
137135
return;
138136
}
139137
HttpServerResponse response = ctx.response();
140-
if (ctx.failure() instanceof InvocationException) {
138+
if (ctx.failure() instanceof InvocationException exception) {
141139
// ServiceComb defined exception
142-
InvocationException exception = (InvocationException) ctx.failure();
143140
response.setStatusCode(exception.getStatusCode());
144141
response.setStatusMessage(exception.getReasonPhrase());
145142
response.end(exception.getErrorData().toString());
@@ -270,8 +267,6 @@ private HttpServerOptions createDefaultHttpServerOptions() {
270267
serverOptions.setUseAlpn(TransportConfig.getUseAlpn())
271268
.setHttp2ConnectionWindowSize(TransportConfig.getHttp2ConnectionWindowSize())
272269
.setIdleTimeout(TransportConfig.getHttp2ConnectionIdleTimeoutInSeconds())
273-
.setReadIdleTimeout(TransportConfig.getHttp2ConnectionIdleTimeoutInSeconds())
274-
.setWriteIdleTimeout(TransportConfig.getHttp2ConnectionIdleTimeoutInSeconds())
275270
.setInitialSettings(new Http2Settings().setPushEnabled(TransportConfig.getPushEnabled())
276271
.setMaxConcurrentStreams(TransportConfig.getMaxConcurrentStreams())
277272
.setHeaderTableSize(TransportConfig.getHttp2HeaderTableSize())
@@ -281,8 +276,6 @@ private HttpServerOptions createDefaultHttpServerOptions() {
281276
);
282277
} else {
283278
serverOptions.setIdleTimeout(TransportConfig.getConnectionIdleTimeoutInSeconds());
284-
serverOptions.setReadIdleTimeout(TransportConfig.getConnectionIdleTimeoutInSeconds());
285-
serverOptions.setWriteIdleTimeout(TransportConfig.getConnectionIdleTimeoutInSeconds());
286279
}
287280
if (endpointObject.isSslEnabled()) {
288281
SSLOptionFactory factory =

0 commit comments

Comments
 (0)