storage: add replica pointer tag

Debugging aid for cockroachdb#11591.
petermattis · Nov 29, 2016 · a0d3054 · a0d3054
1 parent 7b73805
commit a0d3054
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/pkg/storage/replica.go b/pkg/storage/replica.go
@@ -572,6 +572,8 @@ func newReplica(rangeID roachpb.RangeID, store *Store) *Replica {
 	r.rangeStr.store(0, &roachpb.RangeDescriptor{RangeID: rangeID})
 	// Add replica log tag - the value is rangeStr.String().
 	r.AmbientContext.AddLogTag("r", &r.rangeStr)
+	// Add replica pointer value.
+	r.AmbientContext.AddLogTagStr("@", fmt.Sprintf("%x", r))
 
 	raftMuLogger := syncutil.ThresholdLogger(
 		r.AnnotateCtx(context.Background()),

diff --git a/pkg/storage/store.go b/pkg/storage/store.go
@@ -1988,6 +1988,8 @@ func (s *Store) RemoveReplica(
 func (s *Store) removeReplicaImpl(
 	ctx context.Context, rep *Replica, origDesc roachpb.RangeDescriptor, destroyData bool,
 ) error {
+	log.Infof(ctx, "removing replica")
+
 	desc := rep.Desc()
 	if repDesc, ok := desc.GetReplicaDescriptor(s.StoreID()); ok && repDesc.ReplicaID >= origDesc.NextReplicaID {
 		return errors.Errorf("cannot remove replica %s; replica ID has changed (%s >= %s)",