[close tikv#370] make gRPC and TiKV health check configurable (tikv#369)

Signed-off-by: Ankita Wagh <awagh@pinterest.com>
ankita25 · Dec 14, 2021 · 1170503 · 1170503
1 parent 24c7635
commit 1170503
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/src/main/java/org/tikv/common/TiConfiguration.java b/src/main/java/org/tikv/common/TiConfiguration.java
@@ -335,8 +335,8 @@ private static ReplicaRead getReplicaRead(String key) {
 
   private boolean metricsEnable = getBoolean(TIKV_METRICS_ENABLE);
   private int metricsPort = getInt(TIKV_METRICS_PORT);
-  private final int grpcHealthCheckTimeout = getInt(TIKV_GRPC_HEALTH_CHECK_TIMEOUT);
-  private final int healthCheckPeriodDuration = getInt(TIKV_HEALTH_CHECK_PERIOD_DURATION);
+  private int grpcHealthCheckTimeout = getInt(TIKV_GRPC_HEALTH_CHECK_TIMEOUT);
+  private int healthCheckPeriodDuration = getInt(TIKV_HEALTH_CHECK_PERIOD_DURATION);
 
   private final String networkMappingName = get(TIKV_NETWORK_MAPPING_NAME);
   private HostMapping hostMapping = null;
@@ -723,10 +723,18 @@ public long getGrpcHealthCheckTimeout() {
     return this.grpcHealthCheckTimeout;
   }
 
+  public void setGrpcHealthCheckTimeout(int grpcHealthCheckTimeout) {
+    this.grpcHealthCheckTimeout = grpcHealthCheckTimeout;
+  }
+
   public long getHealthCheckPeriodDuration() {
     return this.healthCheckPeriodDuration;
   }
 
+  public void setHealthCheckPeriodDuration(int healthCheckPeriodDuration) {
+    this.healthCheckPeriodDuration = healthCheckPeriodDuration;
+  }
+
   public boolean isEnableAtomicForCAS() {
     return enableAtomicForCAS;
   }

diff --git a/src/test/java/org/tikv/common/TiConfigurationTest.java b/src/test/java/org/tikv/common/TiConfigurationTest.java
@@ -17,7 +17,10 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.tikv.common.ConfigUtils.TIKV_GRPC_HEALTH_CHECK_TIMEOUT;
+import static org.tikv.common.ConfigUtils.TIKV_HEALTH_CHECK_PERIOD_DURATION;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 public class TiConfigurationTest {
@@ -38,6 +41,31 @@ public void tiFlashDefaultValueTest() {
   public void tiJksDefaultValueTest() {
     TiConfiguration conf = TiConfiguration.createRawDefault();
     assertFalse(conf.isJksEnable());
+
+
+  @Test	
+  public void testGrpcHealthCheckTimeoutValue() {
+    TiConfiguration conf = TiConfiguration.createDefault();
+    // default value
+    Assert.assertEquals(
+        TiConfiguration.getInt(TIKV_GRPC_HEALTH_CHECK_TIMEOUT), conf.getGrpcHealthCheckTimeout());
+    // new value
+    int newValue = 100000;
+    conf.setGrpcHealthCheckTimeout(newValue);
+    Assert.assertEquals(newValue, conf.getGrpcHealthCheckTimeout());
+  }
+
+  @Test
+  public void testHealthCheckPeriodDurationValue() {
+    TiConfiguration conf = TiConfiguration.createDefault();
+    // default value
+    Assert.assertEquals(
+        TiConfiguration.getInt(TIKV_HEALTH_CHECK_PERIOD_DURATION),
+        conf.getHealthCheckPeriodDuration());
+    // new value
+    int newValue = 100000;
+    conf.setHealthCheckPeriodDuration(newValue);
+    Assert.assertEquals(newValue, conf.getHealthCheckPeriodDuration());
   }
 
   @Test