storage: extract replica unlinking into store method

Extract some code that was duplicated in three places into a dedicated
helper method.

Release note: None

Author: benesch

pkg/storage/replica.go

@@ -5165,12 +5165,7 @@ func (r *Replica) acquireSplitLock(
 			rightRng.mu.destroyStatus.Set(errors.Errorf("%s: failed to initialize", rightRng), destroyReasonRemoved)
 			rightRng.mu.Unlock()
 			r.store.mu.Lock()
-			r.store.unquiescedReplicas.Lock()
-			delete(r.store.unquiescedReplicas.m, rightRng.RangeID)
-			r.store.unquiescedReplicas.Unlock()
-			r.store.mu.replicas.Delete(int64(rightRng.RangeID))
-			delete(r.store.mu.uninitReplicas, rightRng.RangeID)
-			r.store.replicaQueues.Delete(int64(rightRng.RangeID))
+			r.store.unlinkReplicaByRangeIDLocked(rightRng.RangeID)
 			r.store.mu.Unlock()
 		}
 		rightRng.raftMu.Unlock()

pkg/storage/store.go

@@ -2236,12 +2236,7 @@ func (s *Store) SplitRange(ctx context.Context, origRng, newRng *Replica) error
 		if exRng != newRng {
 			log.Fatalf(ctx, "found unexpected uninitialized replica: %s vs %s", exRng, newRng)
 		}
-		delete(s.mu.uninitReplicas, newDesc.RangeID)
-		s.unquiescedReplicas.Lock()
-		delete(s.unquiescedReplicas.m, newDesc.RangeID)
-		s.unquiescedReplicas.Unlock()
-		s.mu.replicas.Delete(int64(newDesc.RangeID))
-		s.replicaQueues.Delete(int64(newDesc.RangeID))
+		s.unlinkReplicaByRangeIDLocked(newDesc.RangeID)
 	}
 
 	// Replace the end key of the original range with the start key of
@@ -2533,12 +2528,7 @@ func (s *Store) removeReplicaImpl(
 
 	s.mu.Lock()
 	defer s.mu.Unlock()
-	s.unquiescedReplicas.Lock()
-	delete(s.unquiescedReplicas.m, rep.RangeID)
-	s.unquiescedReplicas.Unlock()
-	s.mu.replicas.Delete(int64(rep.RangeID))
-	delete(s.mu.uninitReplicas, rep.RangeID)
-	s.replicaQueues.Delete(int64(rep.RangeID))
+	s.unlinkReplicaByRangeIDLocked(rep.RangeID)
 	if !opts.AllowPlaceholders {
 		if placeholder := s.mu.replicasByKey.Delete(rep); placeholder != rep {
 			// We already checked that our replica was present in replicasByKey
@@ -2554,6 +2544,21 @@ func (s *Store) removeReplicaImpl(
 	return nil
 }
 
+// unlinkReplicaByRangeIDLocked removes all of the store's references to the
+// provided replica that are keyed by its range ID. The replica may also need
+// to be removed from the replicasByKey map.
+//
+// store.mu must be held.
+func (s *Store) unlinkReplicaByRangeIDLocked(rangeID roachpb.RangeID) {
+	s.mu.AssertHeld()
+	s.unquiescedReplicas.Lock()
+	delete(s.unquiescedReplicas.m, rangeID)
+	s.unquiescedReplicas.Unlock()
+	delete(s.mu.uninitReplicas, rangeID)
+	s.replicaQueues.Delete(int64(rangeID))
+	s.mu.replicas.Delete(int64(rangeID))
+}
+
 // processRangeDescriptorUpdate should be called whenever a replica's range
 // descriptor is updated, to update the store's maps of its ranges to match
 // the updated descriptor. Since the latter update requires acquiring the store