Skip to content

Commit

Permalink
Merge pull request #85679 from cockroachdb/blathers/backport-release-…
Browse files Browse the repository at this point in the history
…22.1-85565

release-22.1: kvserver: don't check ConnHealth when releasing proposal quota
  • Loading branch information
pav-kv authored Aug 8, 2022
2 parents 2d8002a + bf59f40 commit 351a0ad
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions pkg/kv/kvserver/replica_proposal_quota.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,9 @@ func (r *Replica) updateProposalQuotaRaftMuLocked(
) {
return
}

// Only consider followers that that have "healthy" RPC connections.
if err := r.store.cfg.NodeDialer.ConnHealth(rep.NodeID, r.connectionClass.get()); err != nil {
return
}
// At this point, we know that either we communicated with this replica
// recently, or we became the leader recently. The latter case is ambiguous
// w.r.t. the actual state of that replica, but it is temporary.

// Note that the Match field has different semantics depending on
// the State.
Expand Down Expand Up @@ -210,7 +208,7 @@ func (r *Replica) updateProposalQuotaRaftMuLocked(
if progress.Match > 0 && progress.Match < minIndex {
minIndex = progress.Match
}
// If this is the most recently added replica and it has caught up, clear
// If this is the most recently added replica, and it has caught up, clear
// our state that was tracking it. This is unrelated to managing proposal
// quota, but this is a convenient place to do so.
if rep.ReplicaID == r.mu.lastReplicaAdded && progress.Match >= commitIndex {
Expand Down

0 comments on commit 351a0ad

Please sign in to comment.