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

ddl: fix gofail data race #6904

Merged
merged 2 commits into from
Jun 25, 2018
Merged

ddl: fix gofail data race #6904

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24a83fb
ddl: fix gofail data race
winkyao Jun 25, 2018
b161315
Merge branch 'master' into fix_data_race
shenli Jun 25, 2018
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
2 changes: 1 addition & 1 deletion ddl/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ func (w *addIndexWorker) run(d *ddlCtx) {

log.Debug("[ddl-reorg] got backfill index task:#v", task)
// gofail: var mockAddIndexErr bool
//if mockAddIndexErr && !gofailMockAddindexErrOnceGuard && w.id == 0 {
//if w.id == 0 && mockAddIndexErr && !gofailMockAddindexErrOnceGuard {
Copy link
Member

Choose a reason for hiding this comment

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

Why could this fix the race?

Copy link
Member

Choose a reason for hiding this comment

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

If the worker id is not 0, it will never access the gofailMockAddindexErrOnceGuard variable.

// gofailMockAddindexErrOnceGuard = true
// result := &addIndexResult{addedCount: 0, nextHandle: 0, err: errors.Errorf("mock add index error")}
// w.resultCh <- result
Expand Down