Merge #143427

143427: go.mod: bump Pebble to b635c4cbebff r=RaduBerinde a=jbowens

Changes:

 * [`b635c4cb`](cockroachdb/pebble@b635c4cb) sstable: remove WriterOptions.Parallelism
 * [`f19adee1`](cockroachdb/pebble@f19adee1) db: remove MaxWriterConcurrency and CPUWorkPermissionGranter

Release note: none.
Epic: none.

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

Author: craig[bot]

DEPS.bzl

@@ -1895,10 +1895,10 @@ def go_deps():
         patches = [
             "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
         ],
-        sha256 = "4df0db2feef2d1e9cb3e19678c1a4fa1d73b638ad6c1de4eb9f816787b9e265f",
-        strip_prefix = "github.com/cockroachdb/[email protected]20250324192946-96302028f139",
+        sha256 = "a8901f53c4564b5f9de74cf014d3a19d5dbde194fe4f77c5e21cea71dceb8e91",
+        strip_prefix = "github.com/cockroachdb/[email protected]20250325151719-b635c4cbebff",
         urls = [
-            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250324192946-96302028f139.zip",
+            "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250325151719-b635c4cbebff.zip",
         ],
     )
     go_repository(

build/bazelutil/distdir_files.bzl

@@ -361,7 +361,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-20250324192946-96302028f139.zip": "4df0db2feef2d1e9cb3e19678c1a4fa1d73b638ad6c1de4eb9f816787b9e265f",
+    "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250325151719-b635c4cbebff.zip": "a8901f53c4564b5f9de74cf014d3a19d5dbde194fe4f77c5e21cea71dceb8e91",
     "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/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
 	github.com/cockroachdb/gostdlib v1.19.0
 	github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
-	github.com/cockroachdb/pebble v0.0.0-20250324192946-96302028f139
+	github.com/cockroachdb/pebble v0.0.0-20250325151719-b635c4cbebff
 	github.com/cockroachdb/redact v1.1.6
 	github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
 	github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b

go.sum

@@ -587,8 +587,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-20250324192946-96302028f139 h1:M4OyhSDhrUnmVbjRhZT+BIgXChNdcnGIiJnCBza4tH4=
-github.com/cockroachdb/pebble v0.0.0-20250324192946-96302028f139/go.mod h1:08jsvr5vUySLPaDXKxg/jhKDWxzg9Hu27nhhi1z30os=
+github.com/cockroachdb/pebble v0.0.0-20250325151719-b635c4cbebff h1:Pj60B+NMfdKzLHPwNpJ2ULVrL079Ll4oFCiAIxxXoZg=
+github.com/cockroachdb/pebble v0.0.0-20250325151719-b635c4cbebff/go.mod h1:08jsvr5vUySLPaDXKxg/jhKDWxzg9Hu27nhhi1z30os=
 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/cli/debug.go

@@ -956,11 +956,6 @@ func runDebugCompact(cmd *cobra.Command, args []string) error {
 		storage.MustExist,
 		storage.DisableAutomaticCompactions,
 		storage.MaxConcurrentCompactions(debugCompactOpts.maxConcurrency),
-		// Currently, any concurrency over 0 enables Writer parallelism.
-		storage.MaxWriterConcurrency(1),
-		// Force Writer Parallelism will allow Writer parallelism to
-		// be enabled without checking the CPU.
-		storage.ForceWriterParallelism,
 	)
 	if err != nil {
 		return err

pkg/server/config.go

@@ -838,7 +838,6 @@ func (cfg *Config) CreateEngines(ctx context.Context) (Engines, error) {
 			addCfgOpt(storage.Caches(pebbleCache, fileCache))
 			// TODO(radu): move up all remaining settings below so they apply to in-memory stores as well.
 			addCfgOpt(storage.MaxOpenFiles(int(openFileLimitPerStore)))
-			addCfgOpt(storage.MaxWriterConcurrency(2))
 			addCfgOpt(storage.RemoteStorageFactory(cfg.EarlyBootExternalStorageAccessor))
 			if sharedStorage != nil {
 				addCfgOpt(storage.SharedStorage(sharedStorage))

pkg/storage/open.go

@@ -53,13 +53,6 @@ var DisableAutomaticCompactions ConfigOption = func(cfg *engineConfig) error {
 	return nil
 }
 
-// ForceWriterParallelism configures an engine to be opened with disabled
-// automatic compactions. Used primarily for debugCompactCmd.
-var ForceWriterParallelism ConfigOption = func(cfg *engineConfig) error {
-	cfg.opts.Experimental.ForceWriterParallelism = true
-	return nil
-}
-
 // ForTesting configures the engine for use in testing. It may randomize some
 // config options to improve test coverage.
 var ForTesting ConfigOption = func(cfg *engineConfig) error {
@@ -141,17 +134,6 @@ func TargetFileSize(size int64) ConfigOption {
 	}
 }
 
-// MaxWriterConcurrency sets the concurrency of the sstable Writers. A concurrency
-// of 0 implies no parallelism in the Writer, and a concurrency of 1 or more implies
-// parallelism in the Writer. Currently, there's no difference between a concurrency
-// of 1 or more.
-func MaxWriterConcurrency(concurrency int) ConfigOption {
-	return func(cfg *engineConfig) error {
-		cfg.opts.Experimental.MaxWriterConcurrency = concurrency
-		return nil
-	}
-}
-
 // MaxOpenFiles sets the maximum number of files an engine should open.
 func MaxOpenFiles(count int) ConfigOption {
 	return func(cfg *engineConfig) error {