tests: skip some tests that are OOM'ing under remote execution

Epic: CRDB-8308 Release note: None
rickystewart · Dec 5, 2023 · 337777f · 337777f
1 parent bd55d22
commit 337777f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 0 deletions.
diff --git a/pkg/kv/kvserver/client_replica_backpressure_test.go b/pkg/kv/kvserver/client_replica_backpressure_test.go
@@ -42,6 +42,7 @@ func TestBackpressureNotAppliedWhenReducingRangeSize(t *testing.T) {
 	defer log.Scope(t).Close(t)
 
 	skip.UnderRace(t, "takes >1m under race")
+	skip.UnderRemoteExecutionWithIssue(t, 113032, "probable OOM")
 
 	rRand, _ := randutil.NewTestRand()
 	ctx := context.Background()

diff --git a/pkg/sql/physicalplan/BUILD.bazel b/pkg/sql/physicalplan/BUILD.bazel
@@ -78,6 +78,7 @@ go_test(
         "//pkg/testutils/distsqlutils",
         "//pkg/testutils/physicalplanutils",
         "//pkg/testutils/serverutils",
+        "//pkg/testutils/skip",
         "//pkg/testutils/sqlutils",
         "//pkg/testutils/testcluster",
         "//pkg/util/leaktest",

diff --git a/pkg/sql/physicalplan/fake_span_resolver_test.go b/pkg/sql/physicalplan/fake_span_resolver_test.go
@@ -24,6 +24,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/testutils/physicalplanutils"
 	"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"
@@ -33,6 +34,8 @@ func TestFakeSpanResolver(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderRemoteExecutionWithIssue(t, 115619, "probable OOM")
+
 	ctx := context.Background()
 	tc := serverutils.StartCluster(t, 3, base.TestClusterArgs{})
 	defer tc.Stopper().Stop(ctx)

diff --git a/pkg/storage/pebble_file_registry_test.go b/pkg/storage/pebble_file_registry_test.go
@@ -564,6 +564,8 @@ func TestFileRegistryRollover(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderRemoteExecutionWithIssue(t, 115617, "probable OOM")
+
 	const dir = "/mydb"
 	mem := vfs.NewMem()
 	require.NoError(t, mem.MkdirAll(dir, 0755))

diff --git a/pkg/testutils/lint/lint_test.go b/pkg/testutils/lint/lint_test.go
@@ -515,6 +515,7 @@ func TestLint(t *testing.T) {
 					":!testutils/datapathutils/data_path.go", // For TEST_UNDECLARED_OUTPUT_DIR, REMOTE_EXEC
 					":!testutils/backup.go",                  // For BACKUP_TESTING_BUCKET
 					":!compose/compose_test.go",              // For PATH.
+					":!testutils/skip/skip.go",               // For REMOTE_EXEC.
 				},
 			},
 		} {

diff --git a/pkg/testutils/skip/skip.go b/pkg/testutils/skip/skip.go
@@ -13,6 +13,7 @@ package skip
 import (
 	"flag"
 	"fmt"
+	"os"
 	"strings"
 	"testing"
 
@@ -198,6 +199,16 @@ func UnderBench() bool {
 	return f != nil && f.Value.String() != ""
 }
 
+// UnderRemoteExecution skips the given test under remote test execution.
+func UnderRemoteExecutionWithIssue(t SkippableTest, githubIssueID int, args ...interface{}) {
+	t.Helper()
+	isRemote := os.Getenv("REMOTE_EXEC")
+	if len(isRemote) > 0 {
+		maybeSkip(t, withIssue("disabled under race", githubIssueID), args...)
+	}
+
+}
+
 func testConfig() string {
 	configs := []string{}
 	if Stress() {