Merge cockroachdb#116090 cockroachdb#116125 cockroachdb#116242

116090: serverccl: skip data distribution test under race r=maryliag a=dhartunian Resolves: cockroachdb#115932 Epic: None Release note: None 116125: sql: skip a couple of tests under deadlock r=yuzefovich a=yuzefovich `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. Fixes: cockroachdb#115861. Fixes: cockroachdb#115998. Release note: None 116242: concurrency: quieten KVNemesis failure because of validation r=arulajmani a=arulajmani We've seen KVNemesis fail regularly because of a specific validation error. For now, quieten the assertion until the issue is fixed -- this ensures legit bugs aren't drowned out by the noise. Informs cockroachdb#115694 Informs cockroachdb#115598 Release note: None Co-authored-by: David Hartunian <[email protected]> Co-authored-by: Yahor Yuzefovich <[email protected]> Co-authored-by: Arul Ajmani <[email protected]>
rickystewart · Dec 12, 2023 · 08c0e5e · 08c0e5e
4 parents 042dceb + 6fb6373 + 78a3657 + f4687ff
commit 08c0e5e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/pkg/ccl/serverccl/admin_test.go b/pkg/ccl/serverccl/admin_test.go
@@ -19,6 +19,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/server/serverpb"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -46,6 +47,8 @@ func TestAdminAPIDataDistributionPartitioning(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderRace(t, "this test creates a 3 node cluster; too resource intensive.")
+
 	// TODO(clust-obs): This test should work with just a single node,
 	// i.e. using serverutils.StartServer` instead of
 	// `StartCluster`.

diff --git a/pkg/ccl/testccl/sqlccl/BUILD.bazel b/pkg/ccl/testccl/sqlccl/BUILD.bazel
@@ -45,6 +45,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
@@ -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/kv/kvserver/concurrency/lock_table.go b/pkg/kv/kvserver/concurrency/lock_table.go
@@ -3932,12 +3932,16 @@ func (kl *keyLocks) verify(st *cluster.Settings) error {
 				}
 			}
 		}
-		if !conflicts {
-			return errors.AssertionFailedf(
-				"queued locking request %d does not conflict with holder/waiting requests %s",
-				qlr.guard.seqNum, kl,
-			)
-		}
+		// TODO(arul): uncomment once 115694 is resolved. This validation has been
+		// regularly failing on KVNemesis -- for now, we disable it to ensure legit
+		// bugs aren't drowned out by the noise.
+		// validation
+		//if !conflicts {
+		//	return errors.AssertionFailedf(
+		//		"queued locking request %d does not conflict with holder/waiting requests %s",
+		//		qlr.guard.seqNum, kl,
+		//	)
+		//}
 	}
 
 	// 4. Ensure invariants around distinguished waiters hold.

diff --git 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()