exempt fix

Author: RaduBerinde

pkg/storage/pebble.go

@@ -2786,11 +2786,8 @@ func (p *pebbleReadOnly) ConsistentIterators() bool {
 // PinEngineStateForIterators implements the Engine interface.
 func (p *pebbleReadOnly) PinEngineStateForIterators(readCategory fs.ReadCategory) error {
 	if p.iter == nil {
-		o := &pebble.IterOptions{Category: readCategory.PebbleCategory()}
-		if p.durability == GuaranteedDurability {
-			o.OnlyReadGuaranteedDurable = true
-		}
-		iter, err := p.parent.db.NewIter(o)
+		o := makeIterOptions(readCategory, p.durability)
+		iter, err := p.parent.db.NewIter(&o)
 		if err != nil {
 			return err
 		}

pkg/storage/pebble_batch.go

@@ -713,11 +713,11 @@ func (p *pebbleBatch) PinEngineStateForIterators(readCategory fs.ReadCategory) e
 	var err error
 	if p.iter == nil {
 		var iter *pebble.Iterator
-		o := &pebble.IterOptions{Category: readCategory.PebbleCategory()}
+		o := makeIterOptions(readCategory, StandardDurability)
 		if p.batch.Indexed() {
-			iter, err = p.batch.NewIter(o)
+			iter, err = p.batch.NewIter(&o)
 		} else {
-			iter, err = p.db.NewIter(o)
+			iter, err = p.db.NewIter(&o)
 		}
 		if err != nil {
 			return err

pkg/storage/pebble_iterator.go

@@ -222,17 +222,9 @@ func (p *pebbleIterator) setOptions(
 	}
 
 	// Generate new Pebble iterator options.
-	p.options = pebble.IterOptions{
-		OnlyReadGuaranteedDurable: durability == GuaranteedDurability,
-		KeyTypes:                  opts.KeyTypes,
-		UseL6Filters:              opts.useL6Filters,
-		Category:                  opts.ReadCategory.PebbleCategory(),
-	}
-	switch opts.ReadCategory {
-	case fs.BatchEvalReadCategory, fs.ScanRegularBatchEvalReadCategory, fs.ScanBackgroundBatchEvalReadCategory:
-		// Exempt hot paths from iterator tracking.
-		p.options.ExemptFromTracking = true
-	}
+	p.options = makeIterOptions(opts.ReadCategory, durability)
+	p.options.KeyTypes = opts.KeyTypes
+	p.options.UseL6Filters = opts.useL6Filters
 	p.prefix = opts.Prefix
 
 	if opts.LowerBound != nil {
@@ -1048,3 +1040,13 @@ func (p *pebbleIterator) assertMVCCInvariants() error {
 
 	return nil
 }
+
+func makeIterOptions(
+	readCategory fs.ReadCategory, durability DurabilityRequirement,
+) pebble.IterOptions {
+	return pebble.IterOptions{
+		OnlyReadGuaranteedDurable: durability == GuaranteedDurability,
+		Category:                  readCategory.PebbleCategory(),
+		ExemptFromTracking:        readCategory == fs.BatchEvalReadCategory || readCategory == fs.ScanRegularBatchEvalReadCategory,
+	}
+}