Merge #112339 #112438

112339: roachtest: reduce concurrency from 1000 to 500 in tpch_concurrency r=yuzefovich a=yuzefovich

This commit lowers the concurrency we use in `tpch_concurrency` test from 1000 to 500 in order to reduce somewhat flaky failures. This is still far larger than what we expect users to have, and this load still gives us coverage to make sure we don't regress on OOM stability front.

Fixes: #112178.

Release note: None

112438: bootstrap: fix buglet in test r=RaduBerinde a=RaduBerinde

This fixes a bug in `TestSupportedReleases`, which causes a failure if we bump the version to 24.1.

Epic: none
Release note: None

Co-authored-by: Yahor Yuzefovich <[email protected]>
Co-authored-by: Radu Berinde <[email protected]>

pkg/cmd/roachtest/tests/tpch_concurrency.go

@@ -161,11 +161,11 @@ func registerTPCHConcurrency(r registry.Registry) {
 		disableStreamer bool,
 	) {
 		setupCluster(ctx, t, c, disableStreamer)
-		// Run at concurrency 1000. We often can push this a bit higher, but
-		// then the iterations also get longer. 1000 concurrently running
-		// analytical queries on the 3 node cluster that doesn't crash is much
-		// more than we expect our users to run.
-		const concurrency = 1000
+		// Run at concurrency 500. We often can push this higher, but then the
+		// iterations also get longer. 500 concurrently running analytical
+		// queries on the 3 node cluster that doesn't crash is much more than we
+		// expect our users to run.
+		const concurrency = 500
 		// Each iteration can take on the order of 3 hours, so we choose the
 		// iteration count such that it'd be definitely completed with 18 hour
 		// timeout.

pkg/sql/catalog/bootstrap/bootstrap_test.go

@@ -45,7 +45,7 @@ func TestSupportedReleases(t *testing.T) {
 	latest := clusterversion.ByKey(clusterversion.BinaryVersionKey)
 	var incumbent roachpb.Version
 	for _, v := range clusterversion.ListBetween(earliest, latest) {
-		if v.Major != incumbent.Major && v.Minor != incumbent.Minor {
+		if v.Major != incumbent.Major || v.Minor != incumbent.Minor {
 			incumbent = roachpb.Version{
 				Major: v.Major,
 				Minor: v.Minor,