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

backport-19.1: storage: avoid deadlock due to reentrant RLock #36577

Merged
merged 1 commit into from
Apr 5, 2019
Merged

backport-19.1: storage: avoid deadlock due to reentrant RLock #36577

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
9 changes: 7 additions & 2 deletions pkg/storage/replica.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,9 +864,15 @@ func (r *Replica) raftStatusRLocked() *raft.Status {
// State returns a copy of the internal state of the Replica, along with some
// auxiliary information.
func (r *Replica) State() storagepb.RangeInfo {
var ri storagepb.RangeInfo

// NB: this acquires an RLock(). Reentrant RLocks are deadlock prone, so do
// this first before RLocking below. Performance of this extra lock
// acquisition is not a concern.
ri.ActiveClosedTimestamp = r.maxClosed(context.Background())

r.mu.RLock()
defer r.mu.RUnlock()
var ri storagepb.RangeInfo
ri.ReplicaState = *(protoutil.Clone(&r.mu.state)).(*storagepb.ReplicaState)
ri.LastIndex = r.mu.lastIndex
ri.NumPending = uint64(len(r.mu.proposals))
Expand All @@ -893,7 +899,6 @@ func (r *Replica) State() storagepb.RangeInfo {
})
}
}
ri.ActiveClosedTimestamp = r.maxClosed(context.Background())
return ri
}

Expand Down