Merge #158798 #158799

158798: process-bep-file: make sure we're inserting newlines in print output r=rail a=rickystewart

Release note: none
Epic: none

158799: bulkmerge: skip tests under `race` r=rail a=rickystewart

These are prone to OOM'ing under `race`.

Release note: none
Epic: none

Co-authored-by: Ricky Stewart <ricky@cockroachlabs.com>

Author: craig[bot]

pkg/cmd/bazci/process-bep-file/main.go

@@ -69,7 +69,7 @@ func process() error {
 	if *jsonOutFile != "" {
 		jsonReport, errs := engflow.ConstructJSONReport(invocation, *serverName)
 		for _, err := range errs {
-			fmt.Printf("error loading JSON test report: %+v", err)
+			fmt.Printf("error loading JSON test report: %+v\n", err)
 		}
 		jsonOut, err := json.Marshal(jsonReport)
 		if err != nil {
@@ -80,11 +80,11 @@ func process() error {
 			return err
 		}
 	} else {
-		fmt.Printf("no -jsonoutfile; skipping constructing JSON test report")
+		fmt.Println("no -jsonoutfile; skipping constructing JSON test report")
 	}
 
 	if githubApiToken == "" {
-		fmt.Printf("no GITHUB_API_TOKEN; skipping reporting to GitHub")
+		fmt.Println("no GITHUB_API_TOKEN; skipping reporting to GitHub")
 		return nil
 	}
 
@@ -98,12 +98,12 @@ func process() error {
 		for _, res := range results {
 			var seenNew bool
 			if res.Err != nil {
-				fmt.Printf("got error downloading test XML for result %+v; got error %+v", res, res.Err)
+				fmt.Printf("got error downloading test XML for result %+v; got error %+v\n", res, res.Err)
 				continue
 			}
 			var testXml bazelutil.TestSuites
 			if err := xml.Unmarshal([]byte(res.TestXml), &testXml); err != nil {
-				fmt.Printf("could not parse test.xml: got error %+v", err)
+				fmt.Printf("could not parse test.xml: got error %+v\n", err)
 				continue
 			}
 			for _, suite := range testXml.Suites {
@@ -137,7 +137,7 @@ func process() error {
 						GithubApiToken: githubApiToken,
 						ExtraParams:    extraParamsSlice,
 					}), testXml); err != nil {
-					fmt.Printf("could not post to GitHub: got error %+v", err)
+					fmt.Printf("could not post to GitHub: got error %+v\n", err)
 				}
 			}
 		}
@@ -165,7 +165,7 @@ func main() {
 		os.Exit(1)
 	}
 	if err := process(); err != nil {
-		fmt.Printf("ERROR: %+v", err)
+		fmt.Printf("ERROR: %+v\n", err)
 		os.Exit(1)
 	}
 }

pkg/sql/bulkmerge/BUILD.bazel

@@ -54,6 +54,7 @@ go_test(
         "//pkg/sql/sem/eval",
         "//pkg/sql/sem/tree",
         "//pkg/testutils/serverutils",
+        "//pkg/testutils/skip",
         "//pkg/testutils/sqlutils",
         "//pkg/testutils/testcluster",
         "//pkg/util/leaktest",

pkg/sql/bulkmerge/merge_test.go

@@ -21,6 +21,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/execinfrapb"
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -132,6 +133,8 @@ func TestDistributedMergeThreeNodes(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderRace(t)
+
 	ctx := context.Background()
 	instanceCount := 3
 	taskCount := 100
@@ -147,6 +150,8 @@ func TestDistributedMergeMoreInstancesThanTasks(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderRace(t)
+
 	ctx := context.Background()
 	instanceCount := 5
 	taskCount := 2 // Fewer tasks than instances