Skip to content

Commit

Permalink
Merge branch 'release-6.5-20230811-v6.5.3' into release-6.5-20230811-…
Browse files Browse the repository at this point in the history
…v6.5.3-10237
  • Loading branch information
hicqu authored Dec 7, 2023
2 parents 007edd9 + 929d843 commit 46f462d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions cdc/kv/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ const (
// failed region will be reloaded via `BatchLoadRegionsWithKeyRange` API. So we
// don't need to force reload region anymore.
regionScheduleReload = false

scanRegionsConcurrency = 1024
)

// time interval to force kv client to terminate gRPC stream and reconnect
Expand Down Expand Up @@ -424,6 +426,8 @@ func (s *eventFeedSession) eventFeed(ctx context.Context, ts uint64) error {
})

g.Go(func() error {
g, ctx := errgroup.WithContext(ctx)
g.SetLimit(scanRegionsConcurrency)
for {
select {
case <-ctx.Done():
Expand Down
4 changes: 2 additions & 2 deletions cdc/processor/sinkmanager/tasks.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ var (
maxUpdateIntervalSize = defaultMaxUpdateIntervalSize

// Sink manager schedules table tasks based on lag. Limit the max task range
// can be helpful to reduce changefeed latency.
maxTaskRange = 5 * time.Second
// can be helpful to reduce changefeed latency for large initial data.
maxTaskRange = 30 * time.Minute
)

// Used to record the progress of the table.
Expand Down

0 comments on commit 46f462d

Please sign in to comment.