From 1ee9eeec4200f50a4a942170129538d37fab5c13 Mon Sep 17 00:00:00 2001 From: Ankita Wagh Date: Tue, 30 Nov 2021 00:35:41 -0800 Subject: [PATCH 1/2] cherry pick #351 to release-3.1 Signed-off-by: ti-srebot --- .../java/org/tikv/common/ConfigUtils.java | 9 ++++++ src/main/java/org/tikv/common/PDClient.java | 13 ++++++++ .../java/org/tikv/common/TiConfiguration.java | 31 +++++++++++++++++++ .../org/tikv/common/TiConfigurationTest.java | 7 +++++ 4 files changed, 60 insertions(+) diff --git a/src/main/java/org/tikv/common/ConfigUtils.java b/src/main/java/org/tikv/common/ConfigUtils.java index f400242ef43..ca9fae3f65a 100644 --- a/src/main/java/org/tikv/common/ConfigUtils.java +++ b/src/main/java/org/tikv/common/ConfigUtils.java @@ -75,6 +75,7 @@ public class ConfigUtils { "tikv.rawkv.batch_write_slowlog_in_ms"; public static final String TIKV_RAWKV_SCAN_SLOWLOG_IN_MS = "tikv.rawkv.scan_slowlog_in_ms"; + public static final String TIFLASH_ENABLE = "tiflash.enable"; public static final String DEF_PD_ADDRESSES = "127.0.0.1:2379"; public static final String DEF_TIMEOUT = "200ms"; public static final String DEF_FORWARD_TIMEOUT = "300ms"; @@ -132,4 +133,12 @@ public class ConfigUtils { public static final String LEADER = "LEADER"; public static final String FOLLOWER = "FOLLOWER"; public static final String LEADER_AND_FOLLOWER = "LEADER_AND_FOLLOWER"; +<<<<<<< HEAD +======= + + public static final int DEF_TIKV_GRPC_KEEPALIVE_TIME = 10; + public static final int DEF_TIKV_GRPC_KEEPALIVE_TIMEOUT = 3; + public static final boolean DEF_TIKV_TLS_ENABLE = false; + public static final boolean DEF_TIFLASH_ENABLE = false; +>>>>>>> e2f10aa... Add a flag to determine if TiFlash is enabled (#351) } diff --git a/src/main/java/org/tikv/common/PDClient.java b/src/main/java/org/tikv/common/PDClient.java index 3d2e7f4189c..7904cf5033e 100644 --- a/src/main/java/org/tikv/common/PDClient.java +++ b/src/main/java/org/tikv/common/PDClient.java @@ -637,6 +637,7 @@ private void initCluster() { 10, 10, TimeUnit.SECONDS); +<<<<<<< HEAD tiflashReplicaService = Executors.newSingleThreadScheduledExecutor( new ThreadFactoryBuilder() @@ -646,6 +647,18 @@ private void initCluster() { tiflashReplicaService.scheduleAtFixedRate( this::updateTiFlashReplicaStatus, 10, 10, TimeUnit.SECONDS); logger.info("init cluster: finish"); +======= + if (conf.isTiFlashEnabled()) { + tiflashReplicaService = + Executors.newSingleThreadScheduledExecutor( + new ThreadFactoryBuilder() + .setNameFormat("PDClient-tiflash-replica-pool-%d") + .setDaemon(true) + .build()); + tiflashReplicaService.scheduleAtFixedRate( + this::updateTiFlashReplicaStatus, 10, 10, TimeUnit.SECONDS); + } +>>>>>>> e2f10aa... Add a flag to determine if TiFlash is enabled (#351) } static class PDClientWrapper { diff --git a/src/main/java/org/tikv/common/TiConfiguration.java b/src/main/java/org/tikv/common/TiConfiguration.java index 54e96224017..a3668ba4c29 100644 --- a/src/main/java/org/tikv/common/TiConfiguration.java +++ b/src/main/java/org/tikv/common/TiConfiguration.java @@ -112,6 +112,7 @@ private static void loadFromDefaultProperties() { setIfMissing(TIKV_GRPC_HEALTH_CHECK_TIMEOUT, DEF_CHECK_HEALTH_TIMEOUT); setIfMissing(TIKV_HEALTH_CHECK_PERIOD_DURATION, DEF_HEALTH_CHECK_PERIOD_DURATION); setIfMissing(TIKV_RAWKV_DEFAULT_BACKOFF_IN_MS, DEF_TIKV_RAWKV_DEFAULT_BACKOFF_IN_MS); +<<<<<<< HEAD setIfMissing(TIKV_RAWKV_READ_TIMEOUT_IN_MS, DEF_TIKV_RAWKV_READ_TIMEOUT_IN_MS); setIfMissing(TIKV_RAWKV_WRITE_TIMEOUT_IN_MS, DEF_TIKV_RAWKV_WRITE_TIMEOUT_IN_MS); setIfMissing(TIKV_RAWKV_BATCH_READ_TIMEOUT_IN_MS, DEF_TIKV_RAWKV_BATCH_READ_TIMEOUT_IN_MS); @@ -120,6 +121,12 @@ private static void loadFromDefaultProperties() { setIfMissing(TIKV_RAWKV_CLEAN_TIMEOUT_IN_MS, DEF_TIKV_RAWKV_CLEAN_TIMEOUT_IN_MS); setIfMissing(TIKV_BO_REGION_MISS_BASE_IN_MS, DEF_TIKV_BO_REGION_MISS_BASE_IN_MS); setIfMissing(TIKV_RAWKV_SCAN_SLOWLOG_IN_MS, DEF_TIKV_RAWKV_SCAN_SLOWLOG_IN_MS); +======= + setIfMissing(TIKV_GRPC_KEEPALIVE_TIME, DEF_TIKV_GRPC_KEEPALIVE_TIME); + setIfMissing(TIKV_GRPC_KEEPALIVE_TIMEOUT, DEF_TIKV_GRPC_KEEPALIVE_TIMEOUT); + setIfMissing(TIKV_TLS_ENABLE, DEF_TIKV_TLS_ENABLE); + setIfMissing(TIFLASH_ENABLE, DEF_TIFLASH_ENABLE); +>>>>>>> e2f10aa... Add a flag to determine if TiFlash is enabled (#351) } public static void listAll() { @@ -314,6 +321,7 @@ private static ReplicaRead getReplicaRead(String key) { private HostMapping hostMapping = null; private int rawKVDefaultBackoffInMS = getInt(TIKV_RAWKV_DEFAULT_BACKOFF_IN_MS); +<<<<<<< HEAD private int rawKVReadTimeoutInMS = getInt(TIKV_RAWKV_READ_TIMEOUT_IN_MS); private int rawKVWriteTimeoutInMS = getInt(TIKV_RAWKV_WRITE_TIMEOUT_IN_MS); private int rawKVBatchReadTimeoutInMS = getInt(TIKV_RAWKV_BATCH_READ_TIMEOUT_IN_MS); @@ -327,6 +335,20 @@ private static ReplicaRead getReplicaRead(String key) { private Optional rawKVBatchWriteSlowLogInMS = getIntOption(TIKV_RAWKV_BATCH_WRITE_SLOWLOG_IN_MS); private int rawKVScanSlowLogInMS = getInt(TIKV_RAWKV_SCAN_SLOWLOG_IN_MS); +======= + + private boolean tlsEnable = getBoolean(TIKV_TLS_ENABLE); + private String trustCertCollectionFile = getOption(TIKV_TRUST_CERT_COLLECTION).orElse(null); + private String keyCertChainFile = getOption(TIKV_KEY_CERT_CHAIN).orElse(null); + private String keyFile = getOption(TIKV_KEY_FILE).orElse(null); + + private boolean tiFlashEnable = getBoolean(TIFLASH_ENABLE); + + private boolean isTest = false; + + private int keepaliveTime = getInt(TIKV_GRPC_KEEPALIVE_TIME); + private int keepaliveTimeout = getInt(TIKV_GRPC_KEEPALIVE_TIMEOUT); +>>>>>>> e2f10aa... Add a flag to determine if TiFlash is enabled (#351) public enum KVMode { TXN, @@ -698,8 +720,17 @@ public void setRawKVReadSlowLogInMS(Integer rawKVReadSlowLogInMS) { this.rawKVReadSlowLogInMS = Optional.of(rawKVReadSlowLogInMS); } +<<<<<<< HEAD public Integer getRawKVWriteSlowLogInMS() { return rawKVWriteSlowLogInMS.orElse((int) (getTimeout() * 2)); +======= + public boolean isTiFlashEnabled() { + return tiFlashEnable; + } + + public boolean isTlsEnable() { + return tlsEnable; +>>>>>>> e2f10aa... Add a flag to determine if TiFlash is enabled (#351) } public void setRawKVWriteSlowLogInMS(Integer rawKVWriteSlowLogInMS) { diff --git a/src/test/java/org/tikv/common/TiConfigurationTest.java b/src/test/java/org/tikv/common/TiConfigurationTest.java index 64512ba1e9d..95dea69c3d9 100644 --- a/src/test/java/org/tikv/common/TiConfigurationTest.java +++ b/src/test/java/org/tikv/common/TiConfigurationTest.java @@ -16,6 +16,7 @@ package org.tikv.common; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import org.junit.Test; @@ -26,4 +27,10 @@ public void configFileTest() { TiConfiguration conf = TiConfiguration.createRawDefault(); assertEquals("configFileTest", conf.getDBPrefix()); } + + @Test + public void tiFlashDefaultValueTest() { + TiConfiguration conf = TiConfiguration.createRawDefault(); + assertFalse(conf.isTiFlashEnabled()); + } } From cd7a23100bf3779b3c989417a084a719656e11ae Mon Sep 17 00:00:00 2001 From: Jian Zhang Date: Thu, 9 Dec 2021 20:52:45 +0800 Subject: [PATCH 2/2] resolve conflicts Signed-off-by: Jian Zhang --- .../java/org/tikv/common/ConfigUtils.java | 7 ----- src/main/java/org/tikv/common/PDClient.java | 12 -------- .../java/org/tikv/common/TiConfiguration.java | 29 ------------------- 3 files changed, 48 deletions(-) diff --git a/src/main/java/org/tikv/common/ConfigUtils.java b/src/main/java/org/tikv/common/ConfigUtils.java index ca9fae3f65a..e8a368564a0 100644 --- a/src/main/java/org/tikv/common/ConfigUtils.java +++ b/src/main/java/org/tikv/common/ConfigUtils.java @@ -133,12 +133,5 @@ public class ConfigUtils { public static final String LEADER = "LEADER"; public static final String FOLLOWER = "FOLLOWER"; public static final String LEADER_AND_FOLLOWER = "LEADER_AND_FOLLOWER"; -<<<<<<< HEAD -======= - - public static final int DEF_TIKV_GRPC_KEEPALIVE_TIME = 10; - public static final int DEF_TIKV_GRPC_KEEPALIVE_TIMEOUT = 3; - public static final boolean DEF_TIKV_TLS_ENABLE = false; public static final boolean DEF_TIFLASH_ENABLE = false; ->>>>>>> e2f10aa... Add a flag to determine if TiFlash is enabled (#351) } diff --git a/src/main/java/org/tikv/common/PDClient.java b/src/main/java/org/tikv/common/PDClient.java index 7904cf5033e..47a7cb8244d 100644 --- a/src/main/java/org/tikv/common/PDClient.java +++ b/src/main/java/org/tikv/common/PDClient.java @@ -637,17 +637,6 @@ private void initCluster() { 10, 10, TimeUnit.SECONDS); -<<<<<<< HEAD - tiflashReplicaService = - Executors.newSingleThreadScheduledExecutor( - new ThreadFactoryBuilder() - .setNameFormat("PDClient-tiflash-replica-pool-%d") - .setDaemon(true) - .build()); - tiflashReplicaService.scheduleAtFixedRate( - this::updateTiFlashReplicaStatus, 10, 10, TimeUnit.SECONDS); - logger.info("init cluster: finish"); -======= if (conf.isTiFlashEnabled()) { tiflashReplicaService = Executors.newSingleThreadScheduledExecutor( @@ -658,7 +647,6 @@ private void initCluster() { tiflashReplicaService.scheduleAtFixedRate( this::updateTiFlashReplicaStatus, 10, 10, TimeUnit.SECONDS); } ->>>>>>> e2f10aa... Add a flag to determine if TiFlash is enabled (#351) } static class PDClientWrapper { diff --git a/src/main/java/org/tikv/common/TiConfiguration.java b/src/main/java/org/tikv/common/TiConfiguration.java index a3668ba4c29..9cdf5d24f76 100644 --- a/src/main/java/org/tikv/common/TiConfiguration.java +++ b/src/main/java/org/tikv/common/TiConfiguration.java @@ -112,7 +112,6 @@ private static void loadFromDefaultProperties() { setIfMissing(TIKV_GRPC_HEALTH_CHECK_TIMEOUT, DEF_CHECK_HEALTH_TIMEOUT); setIfMissing(TIKV_HEALTH_CHECK_PERIOD_DURATION, DEF_HEALTH_CHECK_PERIOD_DURATION); setIfMissing(TIKV_RAWKV_DEFAULT_BACKOFF_IN_MS, DEF_TIKV_RAWKV_DEFAULT_BACKOFF_IN_MS); -<<<<<<< HEAD setIfMissing(TIKV_RAWKV_READ_TIMEOUT_IN_MS, DEF_TIKV_RAWKV_READ_TIMEOUT_IN_MS); setIfMissing(TIKV_RAWKV_WRITE_TIMEOUT_IN_MS, DEF_TIKV_RAWKV_WRITE_TIMEOUT_IN_MS); setIfMissing(TIKV_RAWKV_BATCH_READ_TIMEOUT_IN_MS, DEF_TIKV_RAWKV_BATCH_READ_TIMEOUT_IN_MS); @@ -121,12 +120,7 @@ private static void loadFromDefaultProperties() { setIfMissing(TIKV_RAWKV_CLEAN_TIMEOUT_IN_MS, DEF_TIKV_RAWKV_CLEAN_TIMEOUT_IN_MS); setIfMissing(TIKV_BO_REGION_MISS_BASE_IN_MS, DEF_TIKV_BO_REGION_MISS_BASE_IN_MS); setIfMissing(TIKV_RAWKV_SCAN_SLOWLOG_IN_MS, DEF_TIKV_RAWKV_SCAN_SLOWLOG_IN_MS); -======= - setIfMissing(TIKV_GRPC_KEEPALIVE_TIME, DEF_TIKV_GRPC_KEEPALIVE_TIME); - setIfMissing(TIKV_GRPC_KEEPALIVE_TIMEOUT, DEF_TIKV_GRPC_KEEPALIVE_TIMEOUT); - setIfMissing(TIKV_TLS_ENABLE, DEF_TIKV_TLS_ENABLE); setIfMissing(TIFLASH_ENABLE, DEF_TIFLASH_ENABLE); ->>>>>>> e2f10aa... Add a flag to determine if TiFlash is enabled (#351) } public static void listAll() { @@ -321,7 +315,6 @@ private static ReplicaRead getReplicaRead(String key) { private HostMapping hostMapping = null; private int rawKVDefaultBackoffInMS = getInt(TIKV_RAWKV_DEFAULT_BACKOFF_IN_MS); -<<<<<<< HEAD private int rawKVReadTimeoutInMS = getInt(TIKV_RAWKV_READ_TIMEOUT_IN_MS); private int rawKVWriteTimeoutInMS = getInt(TIKV_RAWKV_WRITE_TIMEOUT_IN_MS); private int rawKVBatchReadTimeoutInMS = getInt(TIKV_RAWKV_BATCH_READ_TIMEOUT_IN_MS); @@ -335,21 +328,8 @@ private static ReplicaRead getReplicaRead(String key) { private Optional rawKVBatchWriteSlowLogInMS = getIntOption(TIKV_RAWKV_BATCH_WRITE_SLOWLOG_IN_MS); private int rawKVScanSlowLogInMS = getInt(TIKV_RAWKV_SCAN_SLOWLOG_IN_MS); -======= - - private boolean tlsEnable = getBoolean(TIKV_TLS_ENABLE); - private String trustCertCollectionFile = getOption(TIKV_TRUST_CERT_COLLECTION).orElse(null); - private String keyCertChainFile = getOption(TIKV_KEY_CERT_CHAIN).orElse(null); - private String keyFile = getOption(TIKV_KEY_FILE).orElse(null); - private boolean tiFlashEnable = getBoolean(TIFLASH_ENABLE); - private boolean isTest = false; - - private int keepaliveTime = getInt(TIKV_GRPC_KEEPALIVE_TIME); - private int keepaliveTimeout = getInt(TIKV_GRPC_KEEPALIVE_TIMEOUT); ->>>>>>> e2f10aa... Add a flag to determine if TiFlash is enabled (#351) - public enum KVMode { TXN, RAW @@ -720,17 +700,8 @@ public void setRawKVReadSlowLogInMS(Integer rawKVReadSlowLogInMS) { this.rawKVReadSlowLogInMS = Optional.of(rawKVReadSlowLogInMS); } -<<<<<<< HEAD public Integer getRawKVWriteSlowLogInMS() { return rawKVWriteSlowLogInMS.orElse((int) (getTimeout() * 2)); -======= - public boolean isTiFlashEnabled() { - return tiFlashEnable; - } - - public boolean isTlsEnable() { - return tlsEnable; ->>>>>>> e2f10aa... Add a flag to determine if TiFlash is enabled (#351) } public void setRawKVWriteSlowLogInMS(Integer rawKVWriteSlowLogInMS) {