diff --git a/enterprise/server/raft/driver/driver.go b/enterprise/server/raft/driver/driver.go index db3e3f47f89..c1f5735eafe 100644 --- a/enterprise/server/raft/driver/driver.go +++ b/enterprise/server/raft/driver/driver.go @@ -907,33 +907,33 @@ func (rq *Queue) processReplica(ctx context.Context, repl IReplica) (bool, error switch action { case DriverNoop: case DriverSplitRange: - rq.log.Debugf("split range: %d", repl.RangeID()) + rq.log.Debugf("split range (range_id: %d)", repl.RangeID()) change = rq.splitRange(rd) case DriverAddReplica: - rq.log.Debugf("add replica: %d", repl.RangeID()) + rq.log.Debugf("add replica (range_id: %d)", repl.RangeID()) change = rq.addReplica(rd) case DriverReplaceDeadReplica: - rq.log.Debugf("replace dead replica: %d", repl.RangeID()) + rq.log.Debugf("replace dead replica (range_id: %d)", repl.RangeID()) change = rq.replaceDeadReplica(rd) case DriverRemoveReplica: - rq.log.Debugf("remove replica: %d", repl.RangeID()) + rq.log.Debugf("remove replica (range_id: %d)", repl.RangeID()) change = rq.removeReplica(ctx, rd, repl) case DriverRemoveDeadReplica: - rq.log.Debugf("remove dead replica: %d", repl.RangeID()) + rq.log.Debugf("remove dead replica (range_id: %d)", repl.RangeID()) change = rq.removeDeadReplica(rd) case DriverConsiderRebalance: - rq.log.Debugf("consider rebalance: %d", repl.RangeID()) + rq.log.Debugf("consider rebalance: (range_id: %d)", repl.RangeID()) change = rq.rebalance(rd, repl) } if change == nil { - rq.log.Debugf("nothing to do for replica: %d", repl.RangeID()) + rq.log.Debugf("nothing to do for replica: (range_id: %d)", repl.RangeID()) return false, nil } err = rq.applyChange(ctx, change) if err != nil { - rq.log.Warningf("Error apply change: %s", err) + rq.log.Warningf("Error apply change to range_id: %d: %s", repl.RangeID(), err) } if action == DriverNoop || action == DriverConsiderRebalance { diff --git a/enterprise/server/raft/store/store.go b/enterprise/server/raft/store/store.go index 23c1b04e88d..5af2525bbb0 100644 --- a/enterprise/server/raft/store/store.go +++ b/enterprise/server/raft/store/store.go @@ -2260,7 +2260,7 @@ func (s *Store) RemoveReplica(ctx context.Context, req *rfpb.RemoveReplicaReques // we won't be able to connect to the node. c, err := s.apiClient.GetForReplica(ctx, replicaDesc) if err != nil { - s.log.Warningf("RemoveReplica unable to remove data, err getting api client: %s", err) + s.log.Warningf("RemoveReplica unable to remove data on c%dn%d, err getting api client: %s", replicaDesc.GetRangeId(), replicaDesc.GetReplicaId(), err) return rsp, nil } _, err = c.RemoveData(ctx, &rfpb.RemoveDataRequest{