From dbcaee8241d48c70a05b7bab21ecf996182d81f2 Mon Sep 17 00:00:00 2001 From: Yahor Yuzefovich Date: Tue, 12 Dec 2023 00:51:00 +0000 Subject: [PATCH] sql: skip a couple of tests under deadlock `TestExplainRedact` and `TestExplainRedactDDL` are quite long, making that some KV level deadlock mechanism fires incorrectly. We've skipped other tests due to this, so this commit skips these two as well. Release note: None --- pkg/ccl/testccl/sqlccl/BUILD.bazel | 1 + pkg/ccl/testccl/sqlccl/explain_test.go | 3 +++ pkg/sql/explain_test.go | 2 ++ 3 files changed, 6 insertions(+) diff --git a/pkg/ccl/testccl/sqlccl/BUILD.bazel b/pkg/ccl/testccl/sqlccl/BUILD.bazel index 7541b99dd4c8..a5629003833f 100644 --- a/pkg/ccl/testccl/sqlccl/BUILD.bazel +++ b/pkg/ccl/testccl/sqlccl/BUILD.bazel @@ -46,6 +46,7 @@ go_test( "//pkg/sql/tests", "//pkg/testutils", "//pkg/testutils/serverutils", + "//pkg/testutils/skip", "//pkg/testutils/sqlutils", "//pkg/testutils/testcluster", "//pkg/util/hlc", diff --git a/pkg/ccl/testccl/sqlccl/explain_test.go b/pkg/ccl/testccl/sqlccl/explain_test.go index f4cea78f127b..e1815240a432 100644 --- a/pkg/ccl/testccl/sqlccl/explain_test.go +++ b/pkg/ccl/testccl/sqlccl/explain_test.go @@ -19,6 +19,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/lexbase" "github.com/cockroachdb/cockroach/pkg/sql/tests" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" + "github.com/cockroachdb/cockroach/pkg/testutils/skip" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" "github.com/cockroachdb/cockroach/pkg/util/randutil" @@ -33,6 +34,8 @@ func TestExplainRedactDDL(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + skip.UnderDeadlock(t, "the test is too slow") + const numStatements = 10 ctx := context.Background() diff --git a/pkg/sql/explain_test.go b/pkg/sql/explain_test.go index 5179cc725ede..1e54caa6d514 100644 --- a/pkg/sql/explain_test.go +++ b/pkg/sql/explain_test.go @@ -509,6 +509,8 @@ func TestExplainRedact(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + skip.UnderDeadlock(t, "the test is too slow") + const numStatements = 10 ctx := context.Background()