You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2021/09/01 08:17:09 UTC

[servicecomb-java-chassis] branch master updated: [SCB-2317] change client default connection idle timeout to 30s

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

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new a0e0f49  [SCB-2317] change client default connection idle timeout to 30s
a0e0f49 is described below

commit a0e0f4903ec3177447b35d9b7dbf55a548f383c0
Author: zyl <72...@users.noreply.github.com>
AuthorDate: Wed Sep 1 16:17:01 2021 +0800

    [SCB-2317] change client default connection idle timeout to 30s
---
 .../serviceregistry/config/ServiceRegistryConfigBuilder.java   | 10 ----------
 .../transport/rest/client/TransportClientConfig.java           |  2 +-
 .../transport/rest/client/TestTransportClientConfig.java       |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfigBuilder.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfigBuilder.java
index b98426c..998b601 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfigBuilder.java
+++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/config/ServiceRegistryConfigBuilder.java
@@ -149,16 +149,6 @@ class ServiceRegistryConfigBuilder {
     return timeout < 1 ? ServiceRegistryConfig.DEFAULT_TIMEOUT_IN_SECONDS * 2 : timeout;
   }
 
-  public int getIdleWatchTimeout() {
-    // watch idle timeout based on SC PING/PONG interval. SC default value is 30.
-    DynamicIntProperty property =
-        DynamicPropertyFactory.getInstance()
-            .getIntProperty("servicecomb.service.registry.client.timeout.watch",
-                ServiceRegistryConfig.DEFAULT_TIMEOUT_IN_SECONDS * 2);
-    int timeout = property.get();
-    return timeout < 1 ? ServiceRegistryConfig.DEFAULT_TIMEOUT_IN_SECONDS * 2 : timeout;
-  }
-
   public int getRequestTimeout() {
     DynamicIntProperty property =
         DynamicPropertyFactory.getInstance()
diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/TransportClientConfig.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/TransportClientConfig.java
index d925a56..20843ed 100644
--- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/TransportClientConfig.java
+++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/TransportClientConfig.java
@@ -83,7 +83,7 @@ public final class TransportClientConfig {
 
   public static int getConnectionIdleTimeoutInSeconds() {
     return DynamicPropertyFactory.getInstance()
-        .getIntProperty("servicecomb.rest.client.connection.idleTimeoutInSeconds", 60)
+        .getIntProperty("servicecomb.rest.client.connection.idleTimeoutInSeconds", 30)
         .get();
   }
 
diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestTransportClientConfig.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestTransportClientConfig.java
index 80e0752..5e27e1e 100644
--- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestTransportClientConfig.java
+++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/TestTransportClientConfig.java
@@ -48,7 +48,7 @@ public class TestTransportClientConfig {
 
   @Test
   public void getConnectionIdleTimeoutInSeconds() {
-    Assert.assertEquals(60, TransportClientConfig.getConnectionIdleTimeoutInSeconds());
+    Assert.assertEquals(30, TransportClientConfig.getConnectionIdleTimeoutInSeconds());
   }
 
   @Test