From b8abf60bf36c7742dab640393ed2f01ca64d2f90 Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Tue, 24 May 2022 22:54:46 +0800 Subject: [PATCH] config(ticdc): use 1 minute kv retry time (#5499) (#5564) close pingcap/tiflow#5230 --- pkg/cmd/server/server_test.go | 4 ++-- pkg/config/config_test_data.go | 2 +- pkg/config/server_config.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/cmd/server/server_test.go b/pkg/cmd/server/server_test.go index 92285c1593f..99e795509e6 100644 --- a/pkg/cmd/server/server_test.go +++ b/pkg/cmd/server/server_test.go @@ -173,7 +173,7 @@ func TestParseCfg(t *testing.T) { WorkerConcurrent: 8, WorkerPoolSize: 0, RegionScanLimit: 40, - RegionRetryDuration: config.TomlDuration(25 * time.Second), + RegionRetryDuration: config.TomlDuration(time.Minute), }, Debug: &config.DebugConfig{ EnableTableActor: true, @@ -462,7 +462,7 @@ cert-allowed-cn = ["dd","ee"] WorkerConcurrent: 8, WorkerPoolSize: 0, RegionScanLimit: 40, - RegionRetryDuration: config.TomlDuration(25 * time.Second), + RegionRetryDuration: config.TomlDuration(time.Minute), }, Debug: &config.DebugConfig{ EnableTableActor: true, diff --git a/pkg/config/config_test_data.go b/pkg/config/config_test_data.go index c063078cf2d..7f4efa79759 100644 --- a/pkg/config/config_test_data.go +++ b/pkg/config/config_test_data.go @@ -102,7 +102,7 @@ const ( "worker-concurrent": 8, "worker-pool-size": 0, "region-scan-limit": 40, - "region-retry-duration": 25000000000 + "region-retry-duration": 60000000000 }, "debug": { "enable-table-actor": true, diff --git a/pkg/config/server_config.go b/pkg/config/server_config.go index ada1fa9c7a1..864b9ad361b 100644 --- a/pkg/config/server_config.go +++ b/pkg/config/server_config.go @@ -97,8 +97,8 @@ var defaultServerConfig = &ServerConfig{ WorkerPoolSize: 0, // 0 will use NumCPU() * 2 RegionScanLimit: 40, // The default TiKV region election timeout is [10s, 20s], - // Use 25 seconds to cover region leader missing. - RegionRetryDuration: TomlDuration(25 * time.Second), + // Use 1 minute to cover region leader missing. + RegionRetryDuration: TomlDuration(time.Minute), }, Debug: &DebugConfig{ EnableTableActor: true,