Merge #149271 #149286

149271: sql: reset schema_locked correctly in a mixed version state r=fqazi a=fqazi

Previously, when schema_locked was reset it would always adopt the value from create_table_with_schema_locked. This was incorrect, since this setting should only adopted if the cluster is running on 25.3. This patch adds a version gate in the reset logic.

Fixes: #149266

Release note: None

149286: roachtest: add build branch to roachprod's labels r=srosenberg a=golgeek

Up to v24.1, roachtests Prometheus targets were discovered in GCP via the gce_sd_configs mechanism. Starting in v24.2, this mechanism has been replaced by an internal helper service, and the gce_sd_configs discovery was later removed from our Prometheus configuration.

This configuration update has led to missing scraping targets for all versions prior to v24.2. And the discovery mechanism will need to be reintroduced until all supported releases are EOL.

This patch introduces a new label `roachtest-branch` pushed by roachtest during roachprod cluster creation containing the version that is being tested. This will allow filtering in the Prometheus configuration in order to reenable target discovery only for versions prior to v24.2.

The patch is purposefully minimal to be backported all the way back to all supported releases.

Epic: none
Release note: None

Co-authored-by: Faizan Qazi <[email protected]>
Co-authored-by: Ludovic Leroux <[email protected]>

Author: 3 people

pkg/cmd/roachtest/spec/cluster_spec.go

@@ -7,6 +7,7 @@ package spec
 
 import (
 	"fmt"
+	"os"
 	"reflect"
 	"strings"
 	"time"
@@ -31,6 +32,9 @@ const (
 
 	// Zfs file system.
 	Zfs fileSystemType = 1
+
+	// Extra labels added by roachtest
+	RoachtestBranch = "roachtest-branch"
 )
 
 type MemPerCPU int
@@ -385,7 +389,14 @@ func (s *ClusterSpec) RoachprodOpts(
 
 	createVMOpts := vm.DefaultCreateOpts()
 	// N.B. We set "usage=roachtest" as the default, custom label for billing tracking.
-	createVMOpts.CustomLabels = map[string]string{"usage": "roachtest"}
+	createVMOpts.CustomLabels = map[string]string{vm.TagUsage: "roachtest"}
+
+	branch := os.Getenv("TC_BUILD_BRANCH")
+	if branch != "" {
+		// If the branch is set, we add it as a custom label.
+		createVMOpts.CustomLabels[RoachtestBranch] = vm.SanitizeLabel(branch)
+	}
+
 	createVMOpts.ClusterName = "" // Will be set later.
 	if s.Lifetime != 0 {
 		createVMOpts.Lifetime = s.Lifetime

pkg/sql/logictest/testdata/logic_test/schema_locked

@@ -1,3 +1,10 @@
+# Intentionally set this to true in 25.2, this setting
+# should be ignored.
+onlyif config local-mixed-25.2
+statement ok
+SET create_table_with_schema_locked=true
+
+skipif config local-mixed-25.2
 statement ok
 SET create_table_with_schema_locked=false
 

pkg/sql/storageparam/tablestorageparam/BUILD.bazel

@@ -6,6 +6,7 @@ go_library(
     importpath = "github.com/cockroachdb/cockroach/pkg/sql/storageparam/tablestorageparam",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/clusterversion",
         "//pkg/sql/catalog/catpb",
         "//pkg/sql/catalog/tabledesc",
         "//pkg/sql/paramparse",

pkg/sql/storageparam/tablestorageparam/table_storage_param.go

@@ -12,6 +12,7 @@ import (
 	"math"
 	"strings"
 
+	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/tabledesc"
 	"github.com/cockroachdb/cockroach/pkg/sql/paramparse"
@@ -608,7 +609,12 @@ var tableParams = map[string]tableParam{
 			return nil
 		},
 		onReset: func(ctx context.Context, po *Setter, evalCtx *eval.Context, key string) error {
-			po.TableDesc.SchemaLocked = evalCtx.SessionData().CreateTableWithSchemaLocked
+			schemaLockedDefault := evalCtx.SessionData().CreateTableWithSchemaLocked
+			// Before 25.3 tables were never created with schema_locked by default.
+			if !evalCtx.Settings.Version.IsActive(ctx, clusterversion.V25_3) {
+				schemaLockedDefault = false
+			}
+			po.TableDesc.SchemaLocked = schemaLockedDefault
 			return nil
 		},
 	},