Merge #151870 #151936 #152014

151870: sql,multiregion: prevent DROP REGION in user DB from cleaning up `system.sql_instances` r=fqazi a=Nukitt

Previously, DROP REGION cleanup logic for system.sql_instances was 
unintentionally applied to all databases when in multiregion setup, not 
just the system database. The original intent was to only perform this 
cleanup when extending `DROP REGION` for the system database.

However, the logic leaked through, affecting user databases as well.

This PR implements the fix described in #151789, and after a quick 
check of these changes with the blocked tests in the #150730, this 
fixes them plus passes the original tests created for testing drop region 
in system database.

Epic: None
Fixes: #151789
Release note: None

151936: go.mod: bump Pebble to eaca9d0cc5ea r=jbowens a=jbowens

Changes:

 * [`eaca9d0c`](cockroachdb/pebble@eaca9d0c) strparse: add (*Parser).Offset
 * [`f8b8a139`](cockroachdb/pebble@f8b8a139) db: include size of input, output files for blob file rewrites
 * [`d143b0d8`](cockroachdb/pebble@d143b0d8) compact: convert MERGE keys to SET when bottommost

Release note: none.
Epic: none.

152014: roachtest: fix client retry token bucket setting r=jeffswenson a=jeffswenson

Previously, backup fixtures were failing to generate due to a misnamed setting. The setting was originally correct, but became incorrect when I renamed the setting to fix the setting name lint.

We don't have to backport this because the roachtest change hit a merge conflict during the backport and I removed the roachtest changes from the backport since they were non-essential.

Release note: none
Informs: #148334

Co-authored-by: Nukitt <[email protected]>
Co-authored-by: Jackson Owens <[email protected]>
Co-authored-by: Jeff Swenson <[email protected]>

Author: 4 people

DEPS.bzl

@@ -1850,10 +1850,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "668f4a5ade4ee097a7f6f504672e202032329b11f1d0191361d75223922b1986",
-        strip_prefix = "github.com/cockroachdb/[email protected]20250812190039-9be04468f598",
+        sha256 = "2a9f6fbb608f3db62bdce84934a7707cddb3ba1191dcb6978a8c78395c0ec0db",
+        strip_prefix = "github.com/cockroachdb/[email protected]20250813233102-eaca9d0cc5ea",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250812190039-9be04468f598.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250813233102-eaca9d0cc5ea.zip",
         ],
     )
     go_repository(

build/bazelutil/distdir_files.bzl

@@ -359,7 +359,7 @@ DISTDIR_FILES = {
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
-    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250812190039-9be04468f598.zip": "668f4a5ade4ee097a7f6f504672e202032329b11f1d0191361d75223922b1986",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250813233102-eaca9d0cc5ea.zip": "2a9f6fbb608f3db62bdce84934a7707cddb3ba1191dcb6978a8c78395c0ec0db",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
     "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",

go.mod

@@ -136,7 +136,7 @@ require (
 	github.com/cockroachdb/errors v1.12.0
 	github.com/cockroachdb/gostdlib v1.19.0
 	github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
-	github.com/cockroachdb/pebble v0.0.0-20250812190039-9be04468f598
+	github.com/cockroachdb/pebble v0.0.0-20250813233102-eaca9d0cc5ea
 	github.com/cockroachdb/redact v1.1.6
 	github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
 	github.com/cockroachdb/tokenbucket v0.0.0-20250429170803-42689b6311bb

go.sum

@@ -583,8 +583,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
 github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
 github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
 github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
-github.com/cockroachdb/pebble v0.0.0-20250812190039-9be04468f598 h1:38IyfrdbyCapHZZS2A6uCBROisJ3Cy0IirleW955AD0=
-github.com/cockroachdb/pebble v0.0.0-20250812190039-9be04468f598/go.mod h1:86lLSKhilQEdaYPIVAG2mIlDGhxlKX1CUkr4Z09nCzA=
+github.com/cockroachdb/pebble v0.0.0-20250813233102-eaca9d0cc5ea h1:tKjg6T5xxVQTTOZP9f7pgRcjy7LVhyYpIeijndvApPY=
+github.com/cockroachdb/pebble v0.0.0-20250813233102-eaca9d0cc5ea/go.mod h1:86lLSKhilQEdaYPIVAG2mIlDGhxlKX1CUkr4Z09nCzA=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
 github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=

pkg/ccl/multiregionccl/multiregion_system_table_test.go

@@ -598,3 +598,46 @@ func TestMrSystemDatabaseUpgrade(t *testing.T) {
 		{"ALTER PARTITION \"us-east3\" OF INDEX system.public.lease@primary CONFIGURE ZONE USING\n\tnum_voters = 3,\n\tvoter_constraints = '[+region=us-east3]',\n\tlease_preferences = '[[+region=us-east3]]'"},
 	})
 }
+
+// TestDropRegionFromUserDatabaseCleansUpSystemTables verifies that
+// dropping a region from a user database doesn't remove  rows
+// from the system.sql_instances table.
+func TestDropRegionFromUserDatabaseCleansUpSystemTables(t *testing.T) {
+	defer leaktest.AfterTest(t)()
+	defer log.Scope(t).Close(t)
+
+	ctx := context.Background()
+
+	makeSettings := func() *cluster.Settings {
+		cs := cluster.MakeTestingClusterSettings()
+		instancestorage.ReclaimLoopInterval.Override(ctx, &cs.SV, 150*time.Millisecond)
+		return cs
+	}
+
+	_, systemSQL, cleanup := multiregionccltestutils.TestingCreateMultiRegionCluster(t, 3,
+		base.TestingKnobs{},
+		multiregionccltestutils.WithSettings(makeSettings()))
+	defer cleanup()
+
+	sDB := sqlutils.MakeSQLRunner(systemSQL)
+
+	// Create a user database with multiple regions
+	sDB.Exec(t, `CREATE DATABASE userdb PRIMARY REGION "us-east1" REGIONS "us-east2", "us-east3" SURVIVE ZONE FAILURE`)
+
+	// Verify sql_instances has data before the operation
+	initialCount := sDB.QueryStr(t, `SELECT count(*) FROM system.sql_instances`)
+	require.NotEmpty(t, initialCount)
+	require.Equal(t, "13", initialCount[0][0], "sql_instances should have data initially")
+
+	// Drop a region from the USER database (not system database)
+	sDB.Exec(t, `ALTER DATABASE userdb DROP REGION "us-east2"`)
+
+	// BUG: sql_instances table is now empty, but it shouldn't be
+	// The region still exists in the system database, so instances should remain
+	finalCount := sDB.QueryStr(t, `SELECT count(*) FROM system.sql_instances`)
+	require.NotEmpty(t, finalCount)
+	// This assertion will fail, demonstrating the bug.
+	// The count should remain the same since we only dropped from userdb, not system
+	require.Equal(t, initialCount[0][0], finalCount[0][0],
+		"sql_instances count should not change when dropping region from user database")
+}

pkg/cmd/roachtest/tests/backup_fixtures.go

@@ -188,9 +188,9 @@ func (bd *backupDriver) prepareCluster(ctx context.Context) {
 				// there is a snapshot backlog, which makes the snapshot backlog worse
 				// because add sst causes ranges to fall behind and need recovery snapshots
 				// to catch up.
-				"kv.snapshot_rebalance.max_rate":                   "256 MiB",
-				"server.debug.default_vmodule":                     "s3_storage=2",
-				"cloudstorage.s3.enable_client_retry_token_bucket": "false",
+				"kv.snapshot_rebalance.max_rate":                    "256 MiB",
+				"server.debug.default_vmodule":                      "s3_storage=2",
+				"cloudstorage.s3.client_retry_token_bucket.enabled": "false",
 			},
 			install.EnvOption{
 				fmt.Sprintf("COCKROACH_AZURE_APPLICATION_CREDENTIALS_FILE=%s", azureCredentialsFilePath),

pkg/sql/type_change.go

@@ -407,7 +407,7 @@ func (t *typeSchemaChanger) exec(ctx context.Context) error {
 		var idsToRemove []int
 		populateIDsToRemove := func(holder context.Context, txn descs.Txn) error {
 			typeDesc, err := txn.Descriptors().MutableByID(txn.KV()).Type(ctx, t.typeID)
-			if err != nil {
+			if err != nil || typeDesc.GetParentID() != keys.SystemDatabaseID {
 				return err
 			}
 			for _, member := range typeDesc.EnumMembers {