release-2.0: storage: don't trip breaker if context is canceled

This PR backports the idea behind cockroachdb#35433 to release-2.0. Release note: None
ajwerner · Mar 11, 2019 · c6faf2a · c6faf2a
1 parent 43cc479
commit c6faf2a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/storage/raft_transport.go b/pkg/storage/raft_transport.go
@@ -464,7 +464,9 @@ func (t *RaftTransport) connectAndProcess(
 		if consecFailures == 0 {
 			log.Warningf(ctx, "raft transport stream to node %d failed: %s", nodeID, err)
 		}
-		breaker.Fail(err)
+		if ctx.Err() == nil {
+			breaker.Fail(err)
+		}
 	}
 }