[SCB-2684]fix idle time out and keep alive timeout not properly set p…

…roblem (apache#3346)
lbc97 · Feb 21, 2023 · 5061d6f · 5061d6f
1 parent 116aaec
commit 5061d6f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/...java/org/apache/servicecomb/serviceregistry/client/http/RegistryHttpClientOptionsSPI.java b/...java/org/apache/servicecomb/serviceregistry/client/http/RegistryHttpClientOptionsSPI.java
@@ -130,7 +130,11 @@ public int getMaxHeaderSize() {
 
   @Override
   public int getKeepAliveTimeout() {
-    return HttpClientOptions.DEFAULT_KEEP_ALIVE_TIMEOUT;
+    int result = getIdleTimeoutInSeconds();
+    if (result > 1) {
+      return result - 1;
+    }
+    return result;
   }
 
   @Override

diff --git a/.../java/org/apache/servicecomb/transport/rest/client/HttpTransportHttpClientOptionsSPI.java b/.../java/org/apache/servicecomb/transport/rest/client/HttpTransportHttpClientOptionsSPI.java
@@ -128,7 +128,7 @@ public int getMaxHeaderSize() {
 
   @Override
   public int getKeepAliveTimeout() {
-    return TransportClientConfig.getConnectionIdleTimeoutInSeconds();
+    return TransportClientConfig.getConnectionKeepAliveTimeoutInSeconds();
   }
 
   @Override

diff --git a/...ent/src/main/java/org/apache/servicecomb/transport/rest/client/TransportClientConfig.java b/...ent/src/main/java/org/apache/servicecomb/transport/rest/client/TransportClientConfig.java
@@ -93,6 +93,21 @@ public static boolean getConnectionKeepAlive() {
         .get();
   }
 
+  public static int getConnectionKeepAliveTimeoutInSeconds() {
+    int result = DynamicPropertyFactory.getInstance()
+        .getIntProperty("servicecomb.rest.client.connection.keepAliveTimeoutInSeconds",
+            -1)
+        .get();
+    if (result >= 0) {
+      return result;
+    }
+    result = getConnectionIdleTimeoutInSeconds();
+    if (result > 1) {
+      return result - 1; // a bit shorter than ConnectionIdleTimeoutInSeconds
+    }
+    return result;
+  }
+
   public static boolean getConnectionCompression() {
     return DynamicPropertyFactory.getInstance()
         .getBooleanProperty("servicecomb.rest.client.connection.compression",