From 3e0deff49ccbe3cc4190e57b6213e94c3301b30d Mon Sep 17 00:00:00 2001 From: Xiaoyuan Jin Date: Fri, 27 Sep 2024 20:03:42 +0800 Subject: [PATCH] This is an automated cherry-pick of #56362 Signed-off-by: ti-chi-bot --- pkg/owner/BUILD.bazel | 4 ++++ pkg/owner/manager.go | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/pkg/owner/BUILD.bazel b/pkg/owner/BUILD.bazel index 20d8e5ac8debe..cd7e27a784df3 100644 --- a/pkg/owner/BUILD.bazel +++ b/pkg/owner/BUILD.bazel @@ -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", diff --git a/pkg/owner/manager.go b/pkg/owner/manager.go index 4db5d655dafaa..24a0678ecc411 100644 --- a/pkg/owner/manager.go +++ b/pkg/owner/manager.go @@ -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 }