From 1c2e2de1276a7507545c7f534d157529740a4fef Mon Sep 17 00:00:00 2001 From: Neil Shen Date: Mon, 23 May 2022 17:10:49 +0800 Subject: [PATCH] This is an automated cherry-pick of #5499 Signed-off-by: ti-chi-bot --- pkg/cmd/server/server_test.go | 14 ++++++++++++++ pkg/config/config_test_data.go | 5 +++++ pkg/config/server_config.go | 6 ++++++ 3 files changed, 25 insertions(+) diff --git a/pkg/cmd/server/server_test.go b/pkg/cmd/server/server_test.go index 7aaa5f67947..df562e6e986 100644 --- a/pkg/cmd/server/server_test.go +++ b/pkg/cmd/server/server_test.go @@ -170,9 +170,16 @@ func TestParseCfg(t *testing.T) { }, PerTableMemoryQuota: 10 * 1024 * 1024, // 10M KVClient: &config.KVClientConfig{ +<<<<<<< HEAD WorkerConcurrent: 8, WorkerPoolSize: 0, RegionScanLimit: 40, +======= + WorkerConcurrent: 8, + WorkerPoolSize: 0, + RegionScanLimit: 40, + RegionRetryDuration: config.TomlDuration(time.Minute), +>>>>>>> 4d48968a0 (config(ticdc): use 1 minute kv retry time (#5499)) }, Debug: &config.DebugConfig{ EnableTableActor: false, @@ -454,9 +461,16 @@ cert-allowed-cn = ["dd","ee"] }, PerTableMemoryQuota: 10 * 1024 * 1024, // 10M KVClient: &config.KVClientConfig{ +<<<<<<< HEAD WorkerConcurrent: 8, WorkerPoolSize: 0, RegionScanLimit: 40, +======= + WorkerConcurrent: 8, + WorkerPoolSize: 0, + RegionScanLimit: 40, + RegionRetryDuration: config.TomlDuration(time.Minute), +>>>>>>> 4d48968a0 (config(ticdc): use 1 minute kv retry time (#5499)) }, Debug: &config.DebugConfig{ EnableTableActor: false, diff --git a/pkg/config/config_test_data.go b/pkg/config/config_test_data.go index 78cac8a84b0..2f2c5f10bb6 100644 --- a/pkg/config/config_test_data.go +++ b/pkg/config/config_test_data.go @@ -105,7 +105,12 @@ const ( "kv-client": { "worker-concurrent": 8, "worker-pool-size": 0, +<<<<<<< HEAD "region-scan-limit": 40 +======= + "region-scan-limit": 40, + "region-retry-duration": 60000000000 +>>>>>>> 4d48968a0 (config(ticdc): use 1 minute kv retry time (#5499)) }, "debug": { "enable-table-actor": false, diff --git a/pkg/config/server_config.go b/pkg/config/server_config.go index fcd2e31414d..11cdd226248 100644 --- a/pkg/config/server_config.go +++ b/pkg/config/server_config.go @@ -96,6 +96,12 @@ var defaultServerConfig = &ServerConfig{ WorkerConcurrent: 8, WorkerPoolSize: 0, // 0 will use NumCPU() * 2 RegionScanLimit: 40, +<<<<<<< HEAD +======= + // The default TiKV region election timeout is [10s, 20s], + // Use 1 minute to cover region leader missing. + RegionRetryDuration: TomlDuration(time.Minute), +>>>>>>> 4d48968a0 (config(ticdc): use 1 minute kv retry time (#5499)) }, Debug: &DebugConfig{ EnableTableActor: false,