@ -146,9 +146,6 @@ type ConnPool struct {
// Datacenter is the datacenter of the current agent.
Datacenter string
// ForceTLS is used to enforce outgoing TLS verification
ForceTLS bool
// Server should be set to true if this connection pool is configured in a
// server instead of a client.
Server bool
@ -208,7 +205,7 @@ func (p *ConnPool) Shutdown() error {
// wait for an existing connection attempt to finish, if one if in progress,
// and will return that one if it succeeds. If all else fails, it will return a
// newly-created connection and add it to the pool.
func ( p * ConnPool ) acquire ( dc string , nodeName string , addr net . Addr , useTLS bool ) ( * Conn , error ) {
func ( p * ConnPool ) acquire ( dc string , nodeName string , addr net . Addr ) ( * Conn , error ) {
if nodeName == "" {
return nil , fmt . Errorf ( "pool: ConnPool.acquire requires a node name" )
}
@ -243,7 +240,7 @@ func (p *ConnPool) acquire(dc string, nodeName string, addr net.Addr, useTLS boo
// If we are the lead thread, make the new connection and then wake
// everybody else up to see if we got it.
if isLeadThread {
c , err := p . getNewConn ( dc , nodeName , addr , useTLS )
c , err := p . getNewConn ( dc , nodeName , addr )
p . Lock ( )
delete ( p . limiter , addrStr )
close ( wait )
@ -290,7 +287,6 @@ func (p *ConnPool) DialTimeout(
nodeName string ,
addr net . Addr ,
timeout time . Duration ,
useTLS bool ,
actualRPCType RPCType ,
) ( net . Conn , HalfCloser , error ) {
p . once . Do ( p . init )
@ -314,64 +310,26 @@ func (p *ConnPool) DialTimeout(
)
}
return DialTimeoutWithRPCTypeDirectly (
return p . dial (
dc ,
nodeName ,
addr ,
p . SrcAddr ,
timeout ,
useTLS || p . ForceTLS ,
p . TLSConfigurator . OutgoingRPCWrapper ( ) ,
actualRPCType ,
RPCTLS ,
)
}
// DialTimeoutInsecure is used to establish a raw connection to the given
// server, with given connection timeout. It also writes RPCTLSInsecure as the
// first byte to indicate that the client cannot provide a certificate. This is
// so far only used for AutoEncrypt.Sign.
func ( p * ConnPool ) DialTimeoutInsecure (
dc string ,
nodeName string ,
addr net . Addr ,
timeout time . Duration ,
wrapper tlsutil . DCWrapper ,
) ( net . Conn , HalfCloser , error ) {
p . once . Do ( p . init )
if wrapper == nil {
return nil , nil , fmt . Errorf ( "wrapper cannot be nil" )
} else if dc != p . Datacenter {
return nil , nil , fmt . Errorf ( "insecure dialing prohibited between datacenters" )
}
return DialTimeoutWithRPCTypeDirectly (
dc ,
nodeName ,
addr ,
p . SrcAddr ,
timeout ,
true ,
wrapper ,
RPCTLSInsecure ,
RPCTLSInsecure ,
)
}
func DialTimeoutWithRPCTypeDirectly (
func ( p * ConnPool ) dial (
dc string ,
nodeName string ,
addr net . Addr ,
src * net . TCPAddr ,
timeout time . Duration ,
useTLS bool ,
wrapper tlsutil . DCWrapper ,
actualRPCType RPCType ,
tlsRPCType RPCType ,
) ( net . Conn , HalfCloser , error ) {
// Try to dial the conn
d := & net . Dialer { LocalAddr : s rc, Timeout : timeout }
d := & net . Dialer { LocalAddr : p . SrcAddr , Timeout : timeout }
conn , err := d . Dial ( "tcp" , addr . String ( ) )
if err != nil {
return nil , nil , err
@ -388,7 +346,8 @@ func DialTimeoutWithRPCTypeDirectly(
}
// Check if TLS is enabled
if useTLS && wrapper != nil {
if p . TLSConfigurator . UseTLS ( dc ) {
wrapper := p . TLSConfigurator . OutgoingRPCWrapper ( )
// Switch the connection into TLS mode
if _ , err := conn . Write ( [ ] byte { byte ( tlsRPCType ) } ) ; err != nil {
conn . Close ( )
@ -496,13 +455,13 @@ func DialTimeoutWithRPCTypeViaMeshGateway(
}
// getNewConn is used to return a new connection
func ( p * ConnPool ) getNewConn ( dc string , nodeName string , addr net . Addr , useTLS bool ) ( * Conn , error ) {
func ( p * ConnPool ) getNewConn ( dc string , nodeName string , addr net . Addr ) ( * Conn , error ) {
if nodeName == "" {
return nil , fmt . Errorf ( "pool: ConnPool.getNewConn requires a node name" )
}
// Get a new, raw connection and write the Consul multiplex byte to set the mode
conn , _ , err := p . DialTimeout ( dc , nodeName , addr , defaultDialTimeout , useTLS , RPCMultiplexV2 )
conn , _ , err := p . DialTimeout ( dc , nodeName , addr , defaultDialTimeout , RPCMultiplexV2 )
if err != nil {
return nil , err
}
@ -560,11 +519,11 @@ func (p *ConnPool) releaseConn(conn *Conn) {
}
// getClient is used to get a usable client for an address
func ( p * ConnPool ) getClient ( dc string , nodeName string , addr net . Addr , useTLS bool ) ( * Conn , * StreamClient , error ) {
func ( p * ConnPool ) getClient ( dc string , nodeName string , addr net . Addr ) ( * Conn , * StreamClient , error ) {
retries := 0
START :
// Try to get a conn first
conn , err := p . acquire ( dc , nodeName , addr , useTLS )
conn , err := p . acquire ( dc , nodeName , addr )
if err != nil {
return nil , nil , fmt . Errorf ( "failed to get conn: %v" , err )
}
@ -611,8 +570,12 @@ func (p *ConnPool) RPC(
// AutoEncrypt.Sign is a one-off call and it doesn't make sense to pool that
// connection if it is not being reused.
func ( p * ConnPool ) rpcInsecure ( dc string , nodeName string , addr net . Addr , method string , args interface { } , reply interface { } ) error {
if dc != p . Datacenter {
return fmt . Errorf ( "insecure dialing prohibited between datacenters" )
}
var codec rpc . ClientCodec
conn , _ , err := p . DialTimeoutInsecure ( dc , nodeName , addr , 1 * time . Second , p . TLSConfigurator . OutgoingRPCWrapper ( ) )
conn , _ , err := p . dial ( dc , nodeName , addr , 1 * time . Second , 0 , RPCTLSInsecure )
if err != nil {
return fmt . Errorf ( "rpcinsecure error establishing connection: %v" , err )
}
@ -631,8 +594,7 @@ func (p *ConnPool) rpc(dc string, nodeName string, addr net.Addr, method string,
p . once . Do ( p . init )
// Get a usable client
useTLS := p . TLSConfigurator . UseTLS ( dc )
conn , sc , err := p . getClient ( dc , nodeName , addr , useTLS )
conn , sc , err := p . getClient ( dc , nodeName , addr )
if err != nil {
return fmt . Errorf ( "rpc error getting client: %v" , err )
}
Hans Hasselberg
5 years ago