Skip to content

owner: fix data race on ownerManager.campaignCancel (#56362) #57133

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

Open
wants to merge 1 commit into
base: release-8.5
Choose a base branch
from
+8 −0
Open

owner: fix data race on ownerManager.campaignCancel (#56362) #57133

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions pkg/owner/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,11 @@ go_test(
],
embed = [":owner"],
flaky = True,
<<<<<<< HEAD
shard_count = 10,
=======
shard_count = 9,
>>>>>>> afdd5c2ecd5 (owner: fix data race on ownerManager.campaignCancel (#56362))
deps = [
"//pkg/ddl",
"//pkg/infoschema",
Expand Down
4 changes: 4 additions & 0 deletions pkg/owner/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,11 @@ func (m *ownerManager) CampaignOwner(withTTL ...int) error {
m.wg.Add(1)
var campaignContext context.Context
campaignContext, m.campaignCancel = context.WithCancel(m.ctx)
<<<<<<< HEAD
go m.campaignLoop(campaignContext, campaignSession)
=======
go m.campaignLoop(campaignContext, session)
>>>>>>> afdd5c2ecd5 (owner: fix data race on ownerManager.campaignCancel (#56362))
return nil
}

Expand Down