Merge #155540 #156112 #156119 #156225 #156309

155540: kvserver: add split trigger support to TestReplicaLifecycleDataDriven r=pav-kv a=arulajmani

This patch adds a few directives to construct and evaluate split triggers.

We then use these directives to demonstrate that leases are correctly copied over from the LHS to the RHS. The interesting case is around leader leases, where if the LHS has a leader lease, the RHS gets an expiration based lease. For the other two lease types, the RHS's lease type stays the same.

Epic: none

Release note: None

156112: sql/rowexec: enable tests under secondary tenants r=yuzefovich a=yuzefovich

Given the modifications in recent commits, this mostly required plumbing the right codec into `eval.Context`. Additionally, a few tests needed some extra adjustments for the tenant prefix present in the spans. Only `TestWriteResumeSpan` is still skipped since it wasn't immediately clear what's wrong there.

Epic: CRDB-48945
Release note: None

156119: revert "sql: store bundle when TestStreamerTightBudget fails" r=yuzefovich a=yuzefovich

This reverts commit 48f11d2.

The test hasn't failed in like year and a half and the captured stmt bundle didn't actually give any more insight into why it rarely failed.

Informs: #119675.
Release note: None

156225: clusterversion: move to 26.1 version r=fqazi a=celiala

### Commit 1 (7cded94): clusterversion: move to 26.1 version

This change advances the current release series version on master from 25.4 to 26.1, following the standard M.1 process after forking the release-25.4 branch. This allows the addition of new upgrade gates for version 26.1 and prepares master for the next development cycle.

Changes implemented following the M.1 checklist from pkg/clusterversion/README.md:
- Added version key constant V26_1 (=Latest) and final version V25_4
- Added start version V26_1_Start (version 25.4-2) with first upgrade
- Updated SystemDatabaseSchemaBootstrapVersion to V26_1_Start
- Updated roachpb.successorSeries map (25.4 -> 26.1)
- Updated pkg/build/version.txt to v26.1.0-alpha.00000000
- Copied scplan rules from current to release_25_4
- Updated package names and version references in scplan rules
- Updated rulesForReleases in scplan/plan.go
- Regenerated test outputs for scplan and TestDeclarativeRules
- Updated releases file (25.4 entries removed as expected)
- Regenerated bootstrap test data with updated hash values

Note: PreviousRelease is NOT updated in this change - this only happens in M.3 after the first 25.4 RC is published.

### Commit 2 (8970893): sql: sort rulesForRelease versions in descending order

This fix was caught in a previous draft via: https://github.com/cockroachdb/cockroach/actions/runs/18817950946

- Issue: `rulesForReleases` array values were incorrectly in ascending order.
- Fix: fix was to put them in descending order.

Analysis Verification: I verified that this analysis was correct by looking at the original PR that added this array, which indeed sorts these in descending order:
- https://github.com/cockroachdb/cockroach/pull/97213/files?diff=unified


Release note (bug fix): Fix rulesForReleases ordering
Epic: None

🤖 Generated with [Claude Code](https://claude.com/claude-code)

156309: *: miscellaneous test-tenant-related improvements r=yuzefovich a=yuzefovich

Fixes: #142797.
Fixes: #142801.
Fixes: #142802.
Fixes: #142804.
Fixes: #142805.

Co-authored-by: Arul Ajmani <[email protected]>
Co-authored-by: Yahor Yuzefovich <[email protected]>
Co-authored-by: Celia La <[email protected]>

Author: 4 people

docs/generated/settings/settings-for-tenants.txt

@@ -426,4 +426,4 @@ trace.zipkin.collector	string		the address of a Zipkin instance to receive trace
 ui.database_locality_metadata.enabled	boolean	true	if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute	application
 ui.default_timezone	string		the default timezone used to format timestamps in the ui	application
 ui.display_timezone	enumeration	etc/utc	the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the 'ui.default_timezone' setting instead. 'ui.default_timezone' takes precedence over this setting. [etc/utc = 0, america/new_york = 1]	application
-version	version	1000025.3-upgrading-to-1000025.4-step-014	set the active cluster version in the format '<major>.<minor>'	application
+version	version	1000025.4-upgrading-to-1000026.1-step-002	set the active cluster version in the format '<major>.<minor>'	application

docs/generated/settings/settings.html

@@ -385,6 +385,6 @@
 <tr><td><div id="setting-ui-database-locality-metadata-enabled" class="anchored"><code>ui.database_locality_metadata.enabled</code></div></td><td>boolean</td><td><code>true</code></td><td>if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute</td><td>Basic/Standard/Advanced/Self-Hosted</td></tr>
 <tr><td><div id="setting-ui-default-timezone" class="anchored"><code>ui.default_timezone</code></div></td><td>string</td><td><code></code></td><td>the default timezone used to format timestamps in the ui</td><td>Basic/Standard/Advanced/Self-Hosted</td></tr>
 <tr><td><div id="setting-ui-display-timezone" class="anchored"><code>ui.display_timezone</code></div></td><td>enumeration</td><td><code>etc/utc</code></td><td>the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the &#39;ui.default_timezone&#39; setting instead. &#39;ui.default_timezone&#39; takes precedence over this setting. [etc/utc = 0, america/new_york = 1]</td><td>Basic/Standard/Advanced/Self-Hosted</td></tr>
-<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.3-upgrading-to-1000025.4-step-014</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Basic/Standard/Advanced/Self-Hosted</td></tr>
+<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.4-upgrading-to-1000026.1-step-002</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Basic/Standard/Advanced/Self-Hosted</td></tr>
 </tbody>
 </table>

pkg/BUILD.bazel

@@ -610,6 +610,7 @@ ALL_TESTS = [
     "//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
     "//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
     "//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
+    "//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4_test",
     "//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",
     "//pkg/sql/schemachanger/scplan:scplan_test",
     "//pkg/sql/schemachanger/screl:screl_test",
@@ -2289,6 +2290,8 @@ GO_TARGETS = [
     "//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
     "//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3",
     "//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
+    "//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4",
+    "//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4_test",
     "//pkg/sql/schemachanger/scplan/internal/rules:rules",
     "//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph",
     "//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",

pkg/build/version.txt

@@ -1 +1 @@
-v25.4.0-alpha.2
+v26.1.0-alpha.00000000

pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant

@@ -304,7 +304,7 @@ select crdb_internal.get_vmodule()
 query T
 SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
 ----
-25.4
+26.1
 
 query ITTT colnames,rowsort
 select node_id, component, field, regexp_replace(regexp_replace(value, '^\d+$', '<port>'), e':\\d+', ':<port>') as value from crdb_internal.node_runtime_info
@@ -392,7 +392,7 @@ select * from crdb_internal.gossip_alerts
 query T
 SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
 ----
-25.4
+26.1
 
 user root
 

pkg/ccl/multiregionccl/BUILD.bazel

@@ -105,7 +105,6 @@ go_test(
         "//pkg/testutils/skip",
         "//pkg/testutils/sqlutils",
         "//pkg/testutils/testcluster",
-        "//pkg/util",
         "//pkg/util/ctxgroup",
         "//pkg/util/encoding",
         "//pkg/util/leaktest",

pkg/ccl/multiregionccl/cold_start_latency_test.go

@@ -20,7 +20,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/rpc"
 	"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
 	"github.com/cockroachdb/cockroach/pkg/server"
-	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/spanconfig"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/pgurlutils"
@@ -117,13 +116,11 @@ func TestColdStartLatency(t *testing.T) {
 		args.Knobs.Server = serverKnobs
 		perServerArgs[i] = args
 	}
-	cs := cluster.MakeTestingClusterSettings()
 	tc := testcluster.NewTestCluster(t, numNodes, base.TestClusterArgs{
 		ParallelStart:     true,
 		ServerArgsPerNode: perServerArgs,
 		ServerArgs: base.TestServerArgs{
-			DefaultTestTenant: base.TODOTestTenantDisabled,
-			Settings:          cs,
+			DefaultTestTenant: base.TestControlsTenantsExplicitly,
 		},
 	})
 	go func() {
@@ -261,7 +258,6 @@ COMMIT;`}
 	const password = "asdf"
 	{
 		tenant, tenantDB := serverutils.StartTenant(t, tc.Server(0), base.TestTenantArgs{
-			Settings: cs,
 			TenantID: serverutils.TestTenantID(),
 			TestingKnobs: base.TestingKnobs{
 				Server: tenantServerKnobs(0),
@@ -310,7 +306,6 @@ COMMIT;`}
 		start := timeutil.Now()
 		sn := tenantServerKnobs(i)
 		tenant, err := tc.Server(i).TenantController().StartTenant(ctx, base.TestTenantArgs{
-			Settings:            cs,
 			TenantID:            serverutils.TestTenantID(),
 			DisableCreateTenant: true,
 			SkipTenantCheck:     true,

pkg/ccl/multiregionccl/datadriven_test.go

@@ -208,20 +208,12 @@ func testMultiRegionDataDriven(t *testing.T, testPath string) {
 				tc := testcluster.StartTestCluster(t, numServers, base.TestClusterArgs{
 					ServerArgsPerNode: serverArgs,
 					ServerArgs: base.TestServerArgs{
-						// We need to disable the default test tenant here
-						// because it appears as though operations like
-						// "wait-for-zone-config-changes" only work correctly
-						// when called from the system tenant. More
-						// investigation is required (tracked with #76378).
-						DefaultTestTenant: base.TODOTestTenantDisabled,
+						DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(156305),
 					},
 				})
 				ds.tc = tc
 
-				sqlConn, err := ds.getSQLConn(0)
-				if err != nil {
-					return err.Error()
-				}
+				sysConn := tc.SystemLayer(0).SQLConn(t)
 				// Speed up closing of timestamps, in order to sleep less below before
 				// we can use follower_read_timestamp(). follower_read_timestamp() uses
 				// sum of the following settings. Also, disable all kvserver lease
@@ -237,7 +229,7 @@ SET CLUSTER SETTING kv.allocator.load_based_lease_rebalancing.enabled = false;
 SET CLUSTER SETTING kv.allocator.min_lease_transfer_interval = '5m'
 `,
 					";") {
-					_, err = sqlConn.Exec(stmt)
+					_, err := sysConn.Exec(stmt)
 					if err != nil {
 						return err.Error()
 					}
@@ -341,8 +333,9 @@ SET CLUSTER SETTING kv.allocator.min_lease_transfer_interval = '5m'
 				if err != nil {
 					return err.Error()
 				}
-				cache := ds.tc.Server(idx).DistSenderI().(*kvcoord.DistSender).RangeDescriptorCache()
-				tablePrefix := keys.MustAddr(keys.SystemSQLCodec.TablePrefix(tableID))
+				s := ds.tc.ApplicationLayer(idx)
+				cache := s.DistSenderI().(*kvcoord.DistSender).RangeDescriptorCache()
+				tablePrefix := keys.MustAddr(s.Codec().TablePrefix(tableID))
 				entry, err := cache.TestingGetCached(ctx, tablePrefix, false, roachpb.LAG_BY_CLUSTER_SETTING)
 				if err != nil {
 					return err.Error()
@@ -738,22 +731,22 @@ func (r *replicaPlacement) satisfiesExpectedPlacement(expected *replicaPlacement
 				continue
 			} else {
 				return errors.Newf(
-					"expected node %s to not be present but had replica type %s",
+					"expected node %d to not be present but had replica type %s",
 					node,
 					actualRt.String())
 			}
 		}
 
 		if !found {
 			return errors.Newf(
-				"expected node %s to have replica type %s but was not found",
+				"expected node %d to have replica type %s but was not found",
 				node,
 				expectedRt.String())
 		}
 
 		if expectedRt != actualRt {
 			return errors.Newf(
-				"expected node %s to have replica type %s but was %s",
+				"expected node %d to have replica type %s but was %s",
 				node,
 				expectedRt.String(),
 				actualRt.String())
@@ -793,15 +786,16 @@ func getRangeKeyForInput(
 	var db string
 	d.ScanArgs(t, dbName, &db)
 
-	execCfg := tc.Server(0).ExecutorConfig().(sql.ExecutorConfig)
+	s := tc.ApplicationLayer(0)
+	execCfg := s.ExecutorConfig().(sql.ExecutorConfig)
 
 	tableDesc, err := lookupTable(&execCfg, db, tbName)
 	if err != nil {
 		return nil, err
 	}
 
 	if !d.HasArg(partitionName) {
-		return tableDesc.TableSpan(keys.SystemSQLCodec).Key, nil
+		return tableDesc.TableSpan(s.Codec()).Key, nil
 	}
 
 	var partition string
@@ -831,7 +825,7 @@ func getRangeKeyForInput(
 
 	_, keyPrefix, err := rowenc.DecodePartitionTuple(
 		&tree.DatumAlloc{},
-		keys.SystemSQLCodec,
+		s.Codec(),
 		tableDesc,
 		primaryInd,
 		part,

pkg/ccl/multiregionccl/multiregionccltestutils/testutils.go

@@ -135,8 +135,8 @@ func TestingCreateMultiRegionClusterWithRegionList(
 			// is used to create the MR cluster for all test cases. For
 			// bonus points, the code to re-enable this should also provide more
 			// flexibility in disabling the default test tenant by callers of this
-			// function. Re-enablement is tracked with #76378.
-			DefaultTestTenant: base.TODOTestTenantDisabled,
+			// function.
+			DefaultTestTenant: base.TestDoesNotWorkWithSecondaryTenantsButWeDontKnowWhyYet(156308),
 		},
 	})
 

pkg/ccl/multiregionccl/region_test.go

@@ -28,11 +28,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// startTestCluster starts a 3 node cluster.
-//
-// Note, if a testfeed depends on particular testing knobs, those may
-// need to be applied to each of the servers in the test cluster
-// returned from this function.
 func TestMultiRegionDatabaseStats(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)