Skip to content

Commit

Permalink
storage: make an error benign
Browse files Browse the repository at this point in the history
This was showing up a lot in TestInitialPartitioning. If we're trying to
remove something but nothing needs to be removed, that seems OK (though
there is some question of why we're hitting this regularly).

Release note: None
  • Loading branch information
tbg committed Aug 30, 2019
1 parent fe6452f commit 4373236
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/storage/replicate_queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,8 @@ func (rq *replicateQueue) findRemoveTarget(
}
if len(candidates) == 0 {
// If we timed out and still don't have any valid candidates, give up.
return roachpb.ReplicaDescriptor{}, "", errors.Errorf("no removable replicas from range that needs a removal: %s",
rangeRaftProgress(repl.RaftStatus(), existingReplicas))
return roachpb.ReplicaDescriptor{}, "", &benignError{errors.Errorf("no removable replicas from range that needs a removal: %s",
rangeRaftProgress(repl.RaftStatus(), existingReplicas))}
}

return rq.allocator.RemoveTarget(ctx, zone, candidates, existingReplicas)
Expand Down

0 comments on commit 4373236

Please sign in to comment.