Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

executor: fix IndexMergeReaderExecutor hang when to exit #41560

Closed
wants to merge 1 commit into from
Closed

executor: fix IndexMergeReaderExecutor hang when to exit #41560

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions executor/index_merge_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,12 +360,12 @@ func (e *IndexMergeReaderExecutor) startPartialIndexWorker(ctx context.Context,
SetPaging(e.paging).
SetFromInfoSchema(e.ctx.GetInfoSchema()).
SetClosestReplicaReadAdjuster(newClosestReadAdjuster(e.ctx, &builder.Request, e.partialNetDataSizes[workID]))

forLabel:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe open another issue.

for parTblIdx, keyRange := range keyRanges {
// check if this executor is closed
select {
case <-e.finished:
break
break forLabel
default:
}

Expand Down Expand Up @@ -474,12 +474,12 @@ func (e *IndexMergeReaderExecutor) startPartialTableWorker(ctx context.Context,
}
partialTableReader.dagPB = e.dagPBs[workID]
}

forLabel:
for parTblIdx, tbl := range tbls {
// check if this executor is closed
select {
case <-e.finished:
break
break forLabel
default:
}

Expand Down