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

owner: fix data race on ownerManager.campaignCancel #56362

Merged
merged 6 commits into from
Sep 27, 2024
Merged

owner: fix data race on ownerManager.campaignCancel #56362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
194d959
fix data race of ownerManager.campaignCancel
fishiu Sep 27, 2024
9b64a51
fix data race of ownerManager.campaignCancel
fishiu Sep 27, 2024
7990d24
Update pkg/owner/manager_test.go
fishiu Sep 27, 2024
8c99454
Update pkg/owner/manager_test.go
fishiu Sep 27, 2024
061c237
context as first arg
fishiu Sep 27, 2024
4dd52fb
make bazel_prepare
fishiu Sep 27, 2024
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 pkg/owner/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ go_test(
],
embed = [":owner"],
flaky = True,
shard_count = 8,
shard_count = 9,
deps = [
"//pkg/ddl",
"//pkg/infoschema",
Expand Down
8 changes: 4 additions & 4 deletions pkg/owner/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,9 @@ func (m *ownerManager) CampaignOwner(withTTL ...int) error {
}
m.sessionLease.Store(int64(session.Lease()))
m.wg.Add(1)
go m.campaignLoop(session)
var campaignContext context.Context
campaignContext, m.campaignCancel = context.WithCancel(m.ctx)
go m.campaignLoop(campaignContext, session)
return nil
}

Expand Down Expand Up @@ -241,9 +243,7 @@ func (m *ownerManager) CampaignCancel() {
m.wg.Wait()
}

func (m *ownerManager) campaignLoop(etcdSession *concurrency.Session) {
var campaignContext context.Context
campaignContext, m.campaignCancel = context.WithCancel(m.ctx)
func (m *ownerManager) campaignLoop(campaignContext context.Context, etcdSession *concurrency.Session) {
defer func() {
m.campaignCancel()
if r := recover(); r != nil {
Expand Down
17 changes: 17 additions & 0 deletions pkg/owner/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,23 @@ func deleteLeader(cli *clientv3.Client, prefixKey string) error {
return errors.Trace(err)
}

func TestImmediatelyCancel(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skip("integration.NewClusterV3 will create file contains a colon which is not allowed on Windows")
}
integration.BeforeTestExternal(t)

tInfo := newTestInfo(t)
d := tInfo.ddl
defer tInfo.Close(t)
ownerManager := d.OwnerManager()
for i := 0; i < 10; i++ {
err := ownerManager.CampaignOwner()
require.NoError(t, err)
ownerManager.CampaignCancel()
}
}

func TestAcquireDistributedLock(t *testing.T) {
const addrFmt = "http://127.0.0.1:%d"
cfg := embed.NewConfig()
Expand Down