From e1e4927931bfa8f7609388362e3a79389422f9b7 Mon Sep 17 00:00:00 2001 From: humengyu Date: Wed, 8 Dec 2021 18:52:12 +0800 Subject: [PATCH 1/4] Make check health timeout and period Configurable Signed-off-by: humengyu --- src/main/java/org/tikv/common/TiConfiguration.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/tikv/common/TiConfiguration.java b/src/main/java/org/tikv/common/TiConfiguration.java index aad8df6d956..0793c5cffc8 100644 --- a/src/main/java/org/tikv/common/TiConfiguration.java +++ b/src/main/java/org/tikv/common/TiConfiguration.java @@ -319,8 +319,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; @@ -690,10 +690,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; } From 79d259ce815f479ee2de087e83782de751ef6867 Mon Sep 17 00:00:00 2001 From: humengyu Date: Thu, 9 Dec 2021 14:04:05 +0800 Subject: [PATCH 2/4] add test Signed-off-by: humengyu --- .../org/tikv/common/TiConfigurationTest.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/test/java/org/tikv/common/TiConfigurationTest.java b/src/test/java/org/tikv/common/TiConfigurationTest.java index 95dea69c3d9..684abd1ab14 100644 --- 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 { @@ -33,4 +36,28 @@ public void tiFlashDefaultValueTest() { TiConfiguration conf = TiConfiguration.createRawDefault(); assertFalse(conf.isTiFlashEnabled()); } + + @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 testHealthCheckPeriodDuration() { + 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()); + } } From 368e3066a64bee2662ce4e89db3e7dcf18b54c76 Mon Sep 17 00:00:00 2001 From: humengyu Date: Thu, 9 Dec 2021 14:50:57 +0800 Subject: [PATCH 3/4] add test Signed-off-by: humengyu --- src/test/java/org/tikv/common/TiConfigurationTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/tikv/common/TiConfigurationTest.java b/src/test/java/org/tikv/common/TiConfigurationTest.java index 684abd1ab14..aae7ad589a0 100644 --- a/src/test/java/org/tikv/common/TiConfigurationTest.java +++ b/src/test/java/org/tikv/common/TiConfigurationTest.java @@ -41,8 +41,8 @@ public void tiFlashDefaultValueTest() { public void testGrpcHealthCheckTimeoutValue() { TiConfiguration conf = TiConfiguration.createDefault(); // default value - Assert.assertEquals(TiConfiguration.getInt(TIKV_GRPC_HEALTH_CHECK_TIMEOUT), - conf.getGrpcHealthCheckTimeout()); + Assert.assertEquals( + TiConfiguration.getInt(TIKV_GRPC_HEALTH_CHECK_TIMEOUT), conf.getGrpcHealthCheckTimeout()); // new value int newValue = 100000; conf.setGrpcHealthCheckTimeout(newValue); @@ -53,7 +53,8 @@ public void testGrpcHealthCheckTimeoutValue() { public void testHealthCheckPeriodDuration() { TiConfiguration conf = TiConfiguration.createDefault(); // default value - Assert.assertEquals(TiConfiguration.getInt(TIKV_HEALTH_CHECK_PERIOD_DURATION), + Assert.assertEquals( + TiConfiguration.getInt(TIKV_HEALTH_CHECK_PERIOD_DURATION), conf.getHealthCheckPeriodDuration()); // new value int newValue = 100000; From 60bc572a12bebfa9ffcec840bc3cb8497ab5c475 Mon Sep 17 00:00:00 2001 From: humengyu Date: Fri, 10 Dec 2021 21:50:36 +0800 Subject: [PATCH 4/4] format Signed-off-by: humengyu --- src/test/java/org/tikv/common/TiConfigurationTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/tikv/common/TiConfigurationTest.java b/src/test/java/org/tikv/common/TiConfigurationTest.java index 58b24fc8176..8587ecb69b2 100644 --- a/src/test/java/org/tikv/common/TiConfigurationTest.java +++ b/src/test/java/org/tikv/common/TiConfigurationTest.java @@ -60,8 +60,9 @@ public void testHealthCheckPeriodDurationValue() { int newValue = 100000; conf.setHealthCheckPeriodDuration(newValue); Assert.assertEquals(newValue, conf.getHealthCheckPeriodDuration()); - } + } + @Test public void testGrpcIdleTimeoutValue() { TiConfiguration conf = TiConfiguration.createDefault(); // default value