Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kv: don't try to reject lease transfer when flushing proposal buffer #83520

Merged
merged 1 commit into from
Jun 28, 2022
Merged

kv: don't try to reject lease transfer when flushing proposal buffer #83520

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions pkg/kv/kvserver/replica_proposal_buf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,13 @@ func (b *propBuf) FlushLockedWithRaftGroup(
func (b *propBuf) maybeRejectUnsafeProposalLocked(
ctx context.Context, raftGroup proposerRaft, p *ProposalData,
) (rejected bool) {
if raftGroup == nil {
// If we do not have a raft group, we won't try to propose this proposal.
// Instead, we will register the proposal so that it can be reproposed later
// with a raft group. Wait until that point to determine whether to reject
// the proposal or not.
return false
}
switch {
case p.Request.IsSingleRequestLeaseRequest():
// Handle an edge case about lease acquisitions: we don't want to forward
Expand Down Expand Up @@ -706,9 +713,6 @@ func (b *propBuf) maybeRejectUnsafeProposalLocked(
// leaderStatusRLocked returns the rangeLeaderInfo for the provided raft group,
// or an empty rangeLeaderInfo if the raftGroup is nil.
func (b *propBuf) leaderStatusRLocked(ctx context.Context, raftGroup proposerRaft) rangeLeaderInfo {
if raftGroup == nil {
return rangeLeaderInfo{}
}
leaderInfo := b.p.leaderStatusRLocked(raftGroup)
// Sanity check.
if leaderInfo.leaderKnown && leaderInfo.leader == b.p.getReplicaID() &&
Expand Down