Merge pull request #18465 from a-robinson/cherrypick_18463

cherrypick-1.1: storage: Fix buggy comparison of lastAddedTime in replicate queue
cockroachdb · Sep 13, 2017 · d4a1198 · d4a1198
2 parents 4a2ffb0 + aab0ccc
commit d4a1198
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/storage/replicate_queue.go b/pkg/storage/replicate_queue.go
@@ -338,7 +338,7 @@ func (rq *replicateQueue) processOneChange(
 	case AllocatorRemove:
 		log.VEventf(ctx, 1, "removing a replica")
 		lastReplAdded, lastAddedTime := repl.LastReplicaAdded()
-		if timeutil.Since(lastAddedTime) < newReplicaGracePeriod {
+		if timeutil.Since(lastAddedTime) > newReplicaGracePeriod {
 			lastReplAdded = 0
 		}
 		candidates := filterUnremovableReplicas(repl.RaftStatus(), desc.Replicas, lastReplAdded)