From ed7ed71c5f08cd421a7a6d7a17e3c60e5782be41 Mon Sep 17 00:00:00 2001 From: Ricky Stewart Date: Fri, 21 May 2021 17:33:49 -0500 Subject: [PATCH] bazel: mark `kvserver` test as `exclusive` This tag tells Bazel the test shouldn't be run at the same time as any other build or test tasks, which solves a problem where timing-sensitive tests will sometimes spuriously time out. Ref: https://docs.bazel.build/versions/master/be/common-definitions.html Closes #65407. Release note: None --- pkg/kv/kvserver/BUILD.bazel | 1 + pkg/kv/kvserver/intent_resolver_integration_test.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kv/kvserver/BUILD.bazel b/pkg/kv/kvserver/BUILD.bazel index 39853fc32955..7d9c92ffe17c 100644 --- a/pkg/kv/kvserver/BUILD.bazel +++ b/pkg/kv/kvserver/BUILD.bazel @@ -286,6 +286,7 @@ go_test( data = glob(["testdata/**"]), embed = [":kvserver"], shard_count = 16, + tags = ["exclusive"], deps = [ "//pkg/base", "//pkg/cli/exit", diff --git a/pkg/kv/kvserver/intent_resolver_integration_test.go b/pkg/kv/kvserver/intent_resolver_integration_test.go index d4c61872bbee..b30653f723f6 100644 --- a/pkg/kv/kvserver/intent_resolver_integration_test.go +++ b/pkg/kv/kvserver/intent_resolver_integration_test.go @@ -187,7 +187,6 @@ func TestRollbackSyncRangedIntentResolution(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) skip.UnderRace(t, "timing-sensitive test") - skip.UnderBazelWithIssue(t, 65407, "times out due to high concurrency") ctx := context.Background() srv, _, _ := serverutils.StartServer(t, base.TestServerArgs{