This is an automated cherry-pick of #56362

Signed-off-by: ti-chi-bot <[email protected]>
pingcap · Nov 5, 2024 · a584801 · a584801
1 parent bbf8742
commit a584801
Show file tree

Hide file tree

Showing 3 changed files with 1,119 additions and 0 deletions.
diff --git a/owner/BUILD.bazel b/owner/BUILD.bazel
@@ -32,6 +32,10 @@ go_test(
     ],
     embed = [":owner"],
     flaky = True,
+<<<<<<< HEAD:owner/BUILD.bazel
+=======
+    shard_count = 9,
+>>>>>>> afdd5c2ecd5 (owner: fix data race on ownerManager.campaignCancel (#56362)):pkg/owner/BUILD.bazel
     deps = [
         "//ddl",
         "//infoschema",