Merge pull request #104068 from cockroachdb/blathers/backport-release…

…-23.1-104026

release-23.1: kvserver: don't apply quota pool to lease requests

pkg/kv/kvserver/replica_proposal_quota.go

@@ -17,6 +17,7 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/base"
 	"github.com/cockroachdb/cockroach/pkg/keys"
+	"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/quotapool"
@@ -27,8 +28,14 @@ import (
 )
 
 func (r *Replica) maybeAcquireProposalQuota(
-	ctx context.Context, quota uint64,
+	ctx context.Context, ba *kvpb.BatchRequest, quota uint64,
 ) (*quotapool.IntAlloc, error) {
+	// We don't want to delay lease requests or transfers, in particular
+	// expiration lease extensions. These are small and latency-sensitive.
+	if ba.IsSingleRequestLeaseRequest() || ba.IsSingleTransferLeaseRequest() {
+		return nil, nil
+	}
+
 	r.mu.RLock()
 	quotaPool := r.mu.proposalQuota
 	desc := *r.mu.state.Desc

pkg/kv/kvserver/replica_raft.go

@@ -270,7 +270,7 @@ func (r *Replica) evalAndPropose(
 		))
 	}
 	var err error
-	proposal.quotaAlloc, err = r.maybeAcquireProposalQuota(ctx, quotaSize)
+	proposal.quotaAlloc, err = r.maybeAcquireProposalQuota(ctx, ba, quotaSize)
 	if err != nil {
 		return nil, nil, "", nil, kvpb.NewError(err)
 	}