This is an automated cherry-pick of pingcap#5499

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · May 23, 2022 · 1c2e2de · 1c2e2de
1 parent 2f363f6
commit 1c2e2de
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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,