Merge pull request #7045 from hashicorp/b-rpc-fixes

Some fixes to connection pooling
hashicorp · Feb 3, 2020 · e8136c0 · e8136c0
2 parents 7f43161 + 3bfc7d1
commit e8136c0
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/helper/pool/pool.go b/helper/pool/pool.go
@@ -11,6 +11,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/hashicorp/consul/lib"
 	hclog "github.com/hashicorp/go-hclog"
 	msgpackrpc "github.com/hashicorp/net-rpc-msgpackrpc"
 	"github.com/hashicorp/nomad/helper/tlsutil"
@@ -36,6 +37,7 @@ type StreamClient struct {
 
 func (sc *StreamClient) Close() {
 	sc.stream.Close()
+	sc.codec.Close()
 }
 
 // Conn is a pooled connection to a Nomad server
@@ -425,6 +427,14 @@ func (p *ConnPool) RPC(region string, addr net.Addr, version int, method string,
 	err = msgpackrpc.CallWithCodec(sc.codec, method, args, reply)
 	if err != nil {
 		sc.Close()
+
+		// If we read EOF, the session is toast. Clear it and open a
+		// new session next time
+		// See https://github.com/hashicorp/consul/blob/v1.6.3/agent/pool/pool.go#L471-L477
+		if lib.IsErrEOF(err) {
+			p.clearConn(conn)
+		}
+
 		p.releaseConn(conn)
 
 		// If the error is an RPC Coded error