This is an automated cherry-pick of #9771

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
pingcap · Sep 26, 2023 · 99f7c44 · 99f7c44
1 parent b749474
commit 99f7c44
Show file tree

Hide file tree

Showing 14 changed files with 1,145 additions and 0 deletions.
diff --git a/cdc/kv/client.go b/cdc/kv/client.go
@@ -248,7 +248,12 @@ func (c *CDCClient) newStream(ctx context.Context, addr string, storeID uint64)
 		return nil
 	}
 	if c.config.Debug.EnableKVConnectBackOff {
+<<<<<<< HEAD
 		newStreamErr = retry.Do(ctx, streamFunc, retry.WithBackoffBaseDelay(500),
+=======
+		newStreamErr = retry.Do(ctx, streamFunc,
+			retry.WithBackoffBaseDelay(100),
+>>>>>>> 43848f2fb5 (kv(ticdc): remove backoff from newStream func (#9771))
 			retry.WithMaxTries(2),
 			retry.WithIsRetryableErr(cerror.IsRetryableError),
 		)

diff --git a/cdc/kv/client_test.go b/cdc/kv/client_test.go
@@ -3535,7 +3535,11 @@ func TestPrewriteNotMatchError(t *testing.T) {
 func createFakeEventFeedSession() *eventFeedSession {
 	return newEventFeedSession(
 		&CDCClient{config: config.GetDefaultServerConfig()},
+<<<<<<< HEAD
 		regionspan.ComparableSpan{Start: []byte("a"), End: []byte("b")},
+=======
+		tablepb.Span{StartKey: []byte("a"), EndKey: []byte("b")},
+>>>>>>> 43848f2fb5 (kv(ticdc): remove backoff from newStream func (#9771))
 		nil, /*lockResolver*/
 		100, /*startTs*/
 		nil, /*eventCh*/

diff --git a/cdc/kv/region_worker.go b/cdc/kv/region_worker.go
@@ -147,8 +147,13 @@ func newRegionWorker(
 		rtsManager:    newRegionTsManager(),
 		rtsUpdateCh:   make(chan *rtsUpdateEvent, 1024),
 		storeAddr:     addr,
+<<<<<<< HEAD
 		concurrency:   s.client.config.KVClient.WorkerConcurrent,
 		metrics:       metrics,
+=======
+		concurrency:   int(s.client.config.KVClient.WorkerConcurrent),
+		metrics:       newRegionWorkerMetrics(changefeedID),
+>>>>>>> 43848f2fb5 (kv(ticdc): remove backoff from newStream func (#9771))
 		inputPending:  0,
 	}
 }