Merge pull request #34192 from ajwerner/backport2.1-34026

release-2.1: rpc/nodedialer: check context for cancellation before dialing

pkg/rpc/nodedialer/nodedialer.go

@@ -78,6 +78,10 @@ func (n *Dialer) Dial(ctx context.Context, nodeID roachpb.NodeID) (_ *grpc.Clien
 	if n == nil || n.resolver == nil {
 		return nil, errors.New("no node dialer configured")
 	}
+	// Don't trip the breaker if we're already canceled.
+	if ctxErr := ctx.Err(); ctxErr != nil {
+		return nil, ctxErr
+	}
 	breaker := n.getBreaker(nodeID)
 
 	if !breaker.Ready() {
@@ -118,6 +122,10 @@ func (n *Dialer) DialInternalClient(
 	if n == nil || n.resolver == nil {
 		return nil, nil, errors.New("no node dialer configured")
 	}
+	// Don't trip the breaker if we're already canceled.
+	if ctxErr := ctx.Err(); ctxErr != nil {
+		return nil, nil, ctxErr
+	}
 	addr, err := n.resolver(nodeID)
 	if err != nil {
 		return nil, nil, err