read category fix, exempt intent resolution

Author: RaduBerinde

pkg/kv/kvserver/abortspan/BUILD.bazel

@@ -10,6 +10,7 @@ go_library(
         "//pkg/roachpb",
         "//pkg/storage",
         "//pkg/storage/enginepb",
+        "//pkg/storage/fs",
         "//pkg/util/hlc",
         "//pkg/util/log",
         "//pkg/util/uuid",

pkg/kv/kvserver/abortspan/abortspan.go

@@ -13,6 +13,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
+	"github.com/cockroachdb/cockroach/pkg/storage/fs"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/uuid"
@@ -87,7 +88,9 @@ func (sc *AbortSpan) Get(
 ) (bool, error) {
 	// Pull response from disk and read into reply if available.
 	key := keys.AbortSpanKey(sc.rangeID, txnID)
-	ok, err := storage.MVCCGetProto(ctx, reader, key, hlc.Timestamp{}, entry, storage.MVCCGetOptions{})
+	ok, err := storage.MVCCGetProto(ctx, reader, key, hlc.Timestamp{}, entry, storage.MVCCGetOptions{
+		ReadCategory: fs.AbortSpanReadCategory,
+	})
 	return ok, err
 }
 

pkg/storage/engine.go

@@ -1442,7 +1442,8 @@ func GetIntent(ctx context.Context, reader Reader, key roachpb.Key) (*roachpb.In
 	opts := LockTableIteratorOptions{
 		Prefix: true,
 		// Ignore Exclusive and Shared locks. We only care about intents.
-		MatchMinStr: lock.Intent,
+		MatchMinStr:  lock.Intent,
+		ReadCategory: fs.IntentResolutionReadCategory,
 	}
 	iter, err := NewLockTableIterator(ctx, reader, opts)
 	if err != nil {

pkg/storage/fs/category.go

@@ -44,6 +44,8 @@ const (
 	IntentResolutionReadCategory
 	// BackupReadCategory are reads for backups.
 	BackupReadCategory
+	// AbortSpanReadCategory are reads used to check if a txn was aborted.
+	AbortSpanReadCategory
 )
 
 var readCategoryMap = [...]block.Category{

pkg/storage/lock_table_iterator.go

@@ -110,9 +110,10 @@ func (opts LockTableIteratorOptions) validate() error {
 // toIterOptions converts the LockTableIteratorOptions to IterOptions.
 func (opts LockTableIteratorOptions) toIterOptions() IterOptions {
 	return IterOptions{
-		Prefix:     opts.Prefix,
-		LowerBound: opts.LowerBound,
-		UpperBound: opts.UpperBound,
+		Prefix:       opts.Prefix,
+		LowerBound:   opts.LowerBound,
+		UpperBound:   opts.UpperBound,
+		ReadCategory: opts.ReadCategory,
 	}
 }
 

pkg/storage/pebble.go

@@ -582,7 +582,7 @@ func DefaultPebbleOptions() *pebble.Options {
 	opts.Experimental.SpanPolicyFunc = spanPolicyFunc
 	opts.Experimental.UserKeyCategories = userKeyCategories
 
-	// Every 5 minutes, log iterators that have been open for more than a minute.
+	// Every 5 minutes, log iterators that have been open for more than 1 minute.
 	opts.Experimental.IteratorTracking.PollInterval = 5 * time.Minute
 	opts.Experimental.IteratorTracking.MaxAge = time.Minute
 

pkg/storage/pebble_iterator.go

@@ -1041,12 +1041,19 @@ func (p *pebbleIterator) assertMVCCInvariants() error {
 	return nil
 }
 
+var exemptFromTracking = [...]bool{
+	fs.BatchEvalReadCategory:            true,
+	fs.ScanRegularBatchEvalReadCategory: true,
+	fs.IntentResolutionReadCategory:     true,
+	fs.AbortSpanReadCategory:            true,
+}
+
 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,
+		ExemptFromTracking:        int(readCategory) < len(exemptFromTracking) && exemptFromTracking[readCategory],
 	}
 }