kvserver: plumb a ctx

Release note: None
cockroachdb · Mar 2, 2021 · 84c137e · 84c137e
1 parent 100cc1d
commit 84c137e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/kv/kvserver/store_create_replica.go b/pkg/kv/kvserver/store_create_replica.go
@@ -225,7 +225,7 @@ func (s *Store) tryGetOrCreateReplica(
 		repl.mu.destroyStatus.Set(errors.Wrapf(err, "%s: failed to initialize", repl), destroyReasonRemoved)
 		repl.mu.Unlock()
 		s.mu.Lock()
-		s.unlinkReplicaByRangeIDLocked(rangeID)
+		s.unlinkReplicaByRangeIDLocked(ctx, rangeID)
 		s.mu.Unlock()
 		repl.raftMu.Unlock()
 		return nil, false, err

diff --git a/pkg/kv/kvserver/store_remove_replica.go b/pkg/kv/kvserver/store_remove_replica.go
@@ -160,7 +160,7 @@ func (s *Store) removeInitializedReplicaRaftMuLocked(
 
 	s.mu.Lock()
 	defer s.mu.Unlock()
-	s.unlinkReplicaByRangeIDLocked(rep.RangeID)
+	s.unlinkReplicaByRangeIDLocked(ctx, rep.RangeID)
 	if it := s.mu.replicasByKey.DeleteReplica(ctx, rep); it.repl != rep {
 		// We already checked that our replica was present in replicasByKey
 		// above. Nothing should have been able to change that.
@@ -239,15 +239,15 @@ func (s *Store) removeUninitializedReplicaRaftMuLocked(
 	if s.removePlaceholderLocked(ctx, rep.RangeID) {
 		atomic.AddInt32(&s.counts.droppedPlaceholders, 1)
 	}
-	s.unlinkReplicaByRangeIDLocked(rep.RangeID)
+	s.unlinkReplicaByRangeIDLocked(ctx, rep.RangeID)
 }
 
 // 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) {
+func (s *Store) unlinkReplicaByRangeIDLocked(ctx context.Context, rangeID roachpb.RangeID) {
 	s.mu.AssertHeld()
 	s.unquiescedReplicas.Lock()
 	delete(s.unquiescedReplicas.m, rangeID)