Merge 88a7276 into blathers/backport-release-24.3-134441

cockroachdb · Nov 6, 2024 · 95e35a1 · 95e35a1
2 parents 5b6d111 + 88a7276
commit 95e35a1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/storage/pebble.go b/pkg/storage/pebble.go
@@ -890,6 +890,10 @@ func DefaultPebbleOptions() *pebble.Options {
 		Lower: EncodeMVCCKey(MVCCKey{Key: keys.LocalRangeLockTablePrefix}),
 		Upper: EncodeMVCCKey(MVCCKey{Key: keys.LocalRangeLockTablePrefix.PrefixEnd()}),
 	}
+	// Disable multi-level compaction heuristic for now. See #134423
+	// for why this was disabled, and what needs to be changed to reenable it.
+	// This issue tracks re-enablement: https://github.com/cockroachdb/pebble/issues/4139
+	opts.Experimental.MultiLevelCompactionHeuristic = pebble.NoMultiLevel{}
 
 	for i := 0; i < len(opts.Levels); i++ {
 		l := &opts.Levels[i]