diff --git a/pkg/cli/node.go b/pkg/cli/node.go index 1ddf911f62ed..3fc671a2eaa1 100644 --- a/pkg/cli/node.go +++ b/pkg/cli/node.go @@ -492,7 +492,7 @@ func runDecommissionNodeImpl( } if numReplicaReport > 0 { - printDecommissionReplicas(ctx, *resp) + printDecommissionReplicas(*resp) } if !reflect.DeepEqual(&prevResponse, resp) { @@ -622,13 +622,13 @@ func printDecommissionStatus(resp serverpb.DecommissionStatusResponse) error { clisqlexec.NewRowSliceIter(decommissionResponseValueToRows(resp.Status), decommissionResponseAlignment())) } -func printDecommissionReplicas(ctx context.Context, resp serverpb.DecommissionStatusResponse) { - fmt.Fprintln(stderr, "\npossible decommission stall detected; reporting decommissioning replicas") +func printDecommissionReplicas(resp serverpb.DecommissionStatusResponse) { + fmt.Fprintln(stderr, "\npossible decommission stall detected") for _, nodeStatus := range resp.Status { for _, replica := range nodeStatus.ReportedReplicas { fmt.Fprintf(stderr, - "n%d still has replica id %d for range r%d", + "n%d still has replica id %d for range r%d\n", nodeStatus.NodeID, replica.ReplicaID, replica.RangeID, diff --git a/pkg/server/admin.go b/pkg/server/admin.go index 41a9d602aa85..f45132055fab 100644 --- a/pkg/server/admin.go +++ b/pkg/server/admin.go @@ -2389,7 +2389,7 @@ func (s *adminServer) decommissionStatusHelper( // numReplicaReport is the number of replicas reported for each node. var replicasToReport map[roachpb.NodeID][]*serverpb.DecommissionStatusResponse_Replica if numReplicaReport > 0 { - log.Ops.Warning(ctx, "possible decommission stall detected; reporting decommissioning replicas") + log.Ops.Warning(ctx, "possible decommission stall detected") replicasToReport = make(map[roachpb.NodeID][]*serverpb.DecommissionStatusResponse_Replica) }