Skip to content

Commit

Permalink
cdc: fixes minor bugs pingcap#10168 and pingcap#10169 (pingcap#10170)
Browse files Browse the repository at this point in the history
close pingcap#10168

Signed-off-by: qupeng <qupeng@pingcap.com>
  • Loading branch information
hicqu committed Dec 4, 2023
1 parent 7ae0988 commit f536338
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions cdc/kv/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,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 @@ -432,6 +434,8 @@ func (s *eventFeedSession) eventFeed(ctx context.Context) error {
g.Go(func() error { return s.logSlowRegions(ctx) })

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 @@ -39,8 +39,8 @@ var (
maxUpdateIntervalSize = defaultMaxUpdateIntervalSize

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

// Used to record the progress of the table.
Expand Down
2 changes: 1 addition & 1 deletion cdc/processor/sinkmanager/tasks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestValidateAndAdjustBound(t *testing.T) {
StartTs: 439333515018895365,
CommitTs: 439333515018895366,
},
taskTimeRange: 10 * time.Second,
taskTimeRange: 60 * time.Minute,
expectAdjust: true,
},
{
Expand Down

0 comments on commit f536338

Please sign in to comment.