diff --git a/core/src/main/scala/com/pingcap/tispark/TiConfigConst.scala b/core/src/main/scala/com/pingcap/tispark/TiConfigConst.scala index a5b5e668f..13edb589f 100644 --- a/core/src/main/scala/com/pingcap/tispark/TiConfigConst.scala +++ b/core/src/main/scala/com/pingcap/tispark/TiConfigConst.scala @@ -102,7 +102,5 @@ object TiConfigConst { val DEFAULT_LOAD_TABLES: Boolean = true // health check timeout val GRPC_HEALTH_CHECK_TIMEOUT = "spark.tispark.grpc.health_check_timeout_in_ms" - val DEFAULT_GRPC_HEALTH_CHECK_TIMEOUT = "2000" val GPRC_HEALTH_CHECK_PERIOD = "spark.tispark.grpc.health_check_period_in_ms" - val DEFAULT_GRPC_HEALTH_CHECK_PERIOD = "3000" } diff --git a/core/src/main/scala/com/pingcap/tispark/utils/TiUtil.scala b/core/src/main/scala/com/pingcap/tispark/utils/TiUtil.scala index f77b53a87..485608127 100644 --- a/core/src/main/scala/com/pingcap/tispark/utils/TiUtil.scala +++ b/core/src/main/scala/com/pingcap/tispark/utils/TiUtil.scala @@ -262,10 +262,10 @@ object TiUtil { conf .get( TiConfigConst.GRPC_HEALTH_CHECK_TIMEOUT, - TiConfigConst.DEFAULT_GRPC_HEALTH_CHECK_TIMEOUT) + TiConfiguration.DEFHealthCheckTimeout.toString) .toInt) tiConf.setHealthCheckPeriod(conf - .get(TiConfigConst.GPRC_HEALTH_CHECK_PERIOD, TiConfigConst.DEFAULT_GRPC_HEALTH_CHECK_PERIOD) + .get(TiConfigConst.GPRC_HEALTH_CHECK_PERIOD, TiConfiguration.DEFHealthCheckPeriod.toString) .toInt) tiConf } diff --git a/tikv-client/src/main/java/com/pingcap/tikv/TiConfiguration.java b/tikv-client/src/main/java/com/pingcap/tikv/TiConfiguration.java index 6a9d1be25..2d472912b 100644 --- a/tikv-client/src/main/java/com/pingcap/tikv/TiConfiguration.java +++ b/tikv-client/src/main/java/com/pingcap/tikv/TiConfiguration.java @@ -187,8 +187,11 @@ public TiConfiguration setCertReloadIntervalInSeconds(String interval) { private ReplicaReadPolicy replicaReadPolicy = ReplicaReadPolicy.DEFAULT; private boolean enableGrpcForward = false; - private int healthCheckTimeout; - private int healthCheckPeriod; + + public static final int DEFHealthCheckTimeout = 2000; + public static final int DEFHealthCheckPeriod = 3000; + private int healthCheckTimeout = DEFHealthCheckTimeout; + private int healthCheckPeriod = DEFHealthCheckPeriod; private static Long getTimeAsSeconds(String key) { return Utils.timeStringAsSec(key);