Merge #150712 #151576

150712: master: Update pkg/testutils/release/cockroach_releases.yaml r=rail a=cockroach-teamcity

Update pkg/testutils/release/cockroach_releases.yaml with recent values.

Epic: None
Release note: None
Release justification: test-only updates

151576: server: TestCheckRestartSafe omits descriptor leak check r=fqazi a=dhartunian

These tests were flaking due to the descriptor leak detection during draining that was implemented for tests. This check is unnecessary for the endpoints that are being tested here.

A separate method was added to the test server to omit this assertion called `DrainClientsWithoutLeakCheck` this calls a new internal helper on the `drainServer` that omits the check.

Resolves: #151377
Resolves: #151455
Epic: None
Release note: None

Co-authored-by: CRL Release bot <[email protected]>
Co-authored-by: Rail Aliiev <[email protected]>
Co-authored-by: David Hartunian <[email protected]>

Author: 4 people

pkg/cmd/roachtest/fixtures/1/checkpoint-v25.3.tgz

@@ -547,7 +547,7 @@ func drain(ctx context.Context, ts1 serverutils.TestServerInterface, t *testing.
 	timeoutCtx, cancel := context.WithTimeout(ctx, testutils.SucceedsSoonDuration())
 	defer cancel()
 
-	err := ts1.DrainClients(ctx)
+	err := ts1.DrainClientsWithoutLeakCheck(ctx)
 	require.NoError(t, err)
 
 	for timeoutCtx.Err() == nil {

pkg/cmd/roachtest/fixtures/2/checkpoint-v25.3.tgz

@@ -398,6 +398,12 @@ func (s *drainServer) isDraining() bool {
 // drainClients starts draining the SQL layer.
 func (s *drainServer) drainClients(
 	ctx context.Context, reporter func(int, redact.SafeString),
+) error {
+	return s.drainClientsInternal(ctx, reporter, true /* assertOnLeakedDescriptor */)
+}
+
+func (s *drainServer) drainClientsInternal(
+	ctx context.Context, reporter func(int, redact.SafeString), assertOnLeakedDescriptor bool,
 ) error {
 	// Setup a cancelable context so that the logOpenConns goroutine exits when
 	// this function returns.
@@ -486,7 +492,7 @@ func (s *drainServer) drainClients(
 	// Drain all SQL table leases. This must be done after the pgServer has
 	// given sessions a chance to finish ongoing work and after the background
 	// tasks that may issue SQL statements have shut down.
-	s.sqlServer.leaseMgr.SetDraining(ctx, true /* drain */, reporter, true /*assertOnLeakedDescriptor*/)
+	s.sqlServer.leaseMgr.SetDraining(ctx, true /* drain */, reporter, assertOnLeakedDescriptor)
 
 	session, err := s.sqlServer.sqlLivenessProvider.Release(ctx)
 	if err != nil {

pkg/cmd/roachtest/fixtures/3/checkpoint-v25.3.tgz

@@ -1242,6 +1242,11 @@ func (t *testTenant) DrainClients(ctx context.Context) error {
 	return t.drain.drainClients(ctx, nil /* reporter */)
 }
 
+// DrainClients exports the drainClientsInternal() method for use by tests.
+func (t *testTenant) DrainClientsWithoutLeakCheck(ctx context.Context) error {
+	return t.drain.drainClientsInternal(ctx, nil /* reporter */, false)
+}
+
 // Readiness is part of the serverutils.ApplicationLayerInterface.
 func (t *testTenant) Readiness(ctx context.Context) error {
 	return t.t.admin.checkReadinessForHealthCheck(ctx)
@@ -1943,6 +1948,13 @@ func (ts *testServer) DrainClients(ctx context.Context) error {
 	return ts.drain.drainClients(ctx, nil /* reporter */)
 }
 
+// DrainClientsWithoutLeakCheck exports the drainClients() method for use by tests
+// with descriptor leak checking disabled. This is useful for tests that focus on
+// restart safety logic rather than lease management correctness.
+func (ts *testServer) DrainClientsWithoutLeakCheck(ctx context.Context) error {
+	return ts.drain.drainClientsInternal(ctx, nil, false /* assertOnLeakedDescriptor */)
+}
+
 // Readiness is part of the serverutils.ApplicationLayerInterface.
 func (ts *testServer) Readiness(ctx context.Context) error {
 	return ts.admin.checkReadinessForHealthCheck(ctx)

pkg/cmd/roachtest/fixtures/4/checkpoint-v25.3.tgz

@@ -7,17 +7,17 @@ CONFIG_DARWIN_AMD64 = "darwin-10.9-amd64"
 CONFIG_DARWIN_ARM64 = "darwin-11.0-arm64"
 
 _CONFIGS = [
-    ("25.1.8", [
-        (CONFIG_DARWIN_AMD64, "d57efe62719e4386fa700608ff516166e3e6a99ba77aa55451c9d2b7e52dec5e"),
-        (CONFIG_DARWIN_ARM64, "de8b4752d1adb6d84874dc9a18b257bf996d94b46bd6507c01a5e5dd79f11c8c"),
-        (CONFIG_LINUX_AMD64, "4dcd1d0dbbee3e659bddde2139f76f1ffac1cbccf6177a6d9d53fd158534e968"),
-        (CONFIG_LINUX_ARM64, "642a841efd1575dca6bd447d41332fac5700d44881cd20bf4d54f4e9952b28b7"),
+    ("25.2.4", [
+        (CONFIG_DARWIN_AMD64, "23e2f7e68a38fcc8186f00e021e3e851823a32dad2d31663f594c2b904c71a58"),
+        (CONFIG_DARWIN_ARM64, "86c28ca0400660205db20ebcc81d3ea296f7efae5e6bb13c2bf31bc04651fad6"),
+        (CONFIG_LINUX_AMD64, "7b433d00bb57d9947dc9931058b16f44ff31dd2a25ed625233c3bf62e4413b58"),
+        (CONFIG_LINUX_ARM64, "f808519d147cb0f7772569d981c7f6aa47b82cb06c35e4eb1eb2aaad87024813"),
     ]),
-    ("25.2.2", [
-        (CONFIG_DARWIN_AMD64, "a339440dfa4012756f5c7e1b558b5c6b60deac9f6b2237a136b7b13f04c25696"),
-        (CONFIG_DARWIN_ARM64, "ec20ce6fe930494b1fe6bd10717277d878a8991752a202907faeca7bc5fad924"),
-        (CONFIG_LINUX_AMD64, "b0f695dfa6002834fbeeed0be2f5bf0d2b457b0a245724c3104078ed04549644"),
-        (CONFIG_LINUX_ARM64, "c631bdccd47d2c0f92fc288aab216bb3451cc3b1276aab741b912a9fd61f144f"),
+    ("25.3.0-rc.1", [
+        (CONFIG_DARWIN_AMD64, "3db248ebd5882f3f917048e58b7ee805b34accfa802335ab52f13ff1a8fbcf86"),
+        (CONFIG_DARWIN_ARM64, "637a931ccbea8d3a4cd4832775a8689f1dd91529c29b17ae3dfdfbe9c50d3953"),
+        (CONFIG_LINUX_AMD64, "80d6aa37ce377d7fe096dd9a8ce2f361e2f1e40940989a6ac15b411fee0cf048"),
+        (CONFIG_LINUX_ARM64, "6f400ec9c8b4770be91f23b4b1796bd2dd959352536b4012c4edef7b50e03ae8"),
     ]),
 ]
 

pkg/server/api_v2_test.go

@@ -22,21 +22,24 @@
   latest: 23.2.27
   predecessor: "23.1"
 "24.1":
-  latest: 24.1.20
+  latest: 24.1.22
   predecessor: "23.2"
 "24.2":
   latest: 24.2.10
   withdrawn:
   - 24.2.1
   predecessor: "24.1"
 "24.3":
-  latest: 24.3.15
+  latest: 24.3.17
   predecessor: "24.2"
 "25.1":
-  latest: 25.1.8
+  latest: 25.1.10
   predecessor: "24.3"
 "25.2":
-  latest: 25.2.2
+  latest: 25.2.4
   predecessor: "25.1"
-"25.4":
+"25.3":
+  latest: 25.3.0-rc.1
   predecessor: "25.2"
+"25.4":
+  predecessor: "25.3"

pkg/server/drain.go

@@ -405,6 +405,11 @@ type ApplicationLayerInterface interface {
 	// DrainClients shuts down client connections.
 	DrainClients(ctx context.Context) error
 
+	// DrainClientsWithoutLeakCheck shuts down client connections but will
+	// skip the assertion that checks for descriptor leaks. This is meant
+	// to enable specific tests that may drain unsafely.
+	DrainClientsWithoutLeakCheck(ctx context.Context) error
+
 	// SystemConfigProvider provides access to the system config.
 	SystemConfigProvider() config.SystemConfigProvider