Skip to content

Commit faa1d2b

Browse files
craig[bot]benesch
andcommitted
Merge #27138
27138: storage: use replica cleanup function in yet another code path r=nvanbenschoten a=benesch When extracting replica cleanup into a helper function, Store.unlinkReplicaByRangeIDLocked, in d404a3f, I missed this code path. Release note: None Co-authored-by: Nikhil Benesch <nikhil.benesch@gmail.com>
2 parents 8d74b5c + d24eadb commit faa1d2b

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

pkg/storage/store.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3944,12 +3944,7 @@ func (s *Store) tryGetOrCreateReplica(
39443944
repl.mu.destroyStatus.Set(errors.Wrapf(err, "%s: failed to initialize", repl), destroyReasonRemoved)
39453945
repl.mu.Unlock()
39463946
s.mu.Lock()
3947-
s.unquiescedReplicas.Lock()
3948-
delete(s.unquiescedReplicas.m, rangeID)
3949-
s.unquiescedReplicas.Unlock()
3950-
s.mu.replicas.Delete(int64(rangeID))
3951-
delete(s.mu.uninitReplicas, rangeID)
3952-
s.replicaQueues.Delete(int64(rangeID))
3947+
s.unlinkReplicaByRangeIDLocked(rangeID)
39533948
s.mu.Unlock()
39543949
repl.raftMu.Unlock()
39553950
return nil, false, err

0 commit comments

Comments
 (0)