This is an automated cherry-pick of pingcap#56362

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Nov 5, 2024 · 3e0deff · 3e0deff
1 parent 5518942
commit 3e0deff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -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
 }