From dfb6a3d9a8ec478ffdddc16ab7c0c8324a4ce36c Mon Sep 17 00:00:00 2001
From: Chelsea Holland Komlo <me@chelseakomlo.com>
Date: Tue, 21 Nov 2017 14:45:50 -0500
Subject: [PATCH] close raft long-lived connections

---
 nomad/raft_rpc.go                                 |  2 +-
 nomad/server.go                                   |  8 +++++---
 vendor/github.com/hashicorp/raft/net_transport.go | 13 +++++++++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/nomad/raft_rpc.go b/nomad/raft_rpc.go
index e769b9998..5c5508f16 100644
--- a/nomad/raft_rpc.go
+++ b/nomad/raft_rpc.go
@@ -51,7 +51,7 @@ func (l *RaftLayer) Handoff(c net.Conn, ctx context.Context) error {
 	case <-l.closeCh:
 		return fmt.Errorf("Raft RPC layer closed")
 	case <-ctx.Done():
-		return fmt.Errorf("[INFO] nomad.rpc: Closing server RPC connection")
+		return fmt.Errorf("[INFO] nomad.rpc: Closing raft RPC connection")
 	}
 }
 
diff --git a/nomad/server.go b/nomad/server.go
index 090561242..a9dbef0a1 100644
--- a/nomad/server.go
+++ b/nomad/server.go
@@ -405,14 +405,16 @@ func (s *Server) ReloadTLSConnections(newTLSConfig *config.TLSConfig) error {
 	}
 	s.rpcListener = list
 
+	wrapper := tlsutil.RegionSpecificWrapper(s.config.Region, tlsWrap)
+	s.raftLayer.ReloadTLS(wrapper)
+	s.raftTransport.Reload()
+	time.Sleep(500 * time.Millisecond)
+
 	// reinitialize the cancel context
 	ctx, cancel := context.WithCancel(context.Background())
 	s.rpcCancel = cancel
 	go s.listen(ctx)
 
-	wrapper := tlsutil.RegionSpecificWrapper(s.config.Region, tlsWrap)
-	s.raftLayer.ReloadTLS(wrapper)
-
 	s.logger.Printf("[INFO] nomad: finished reloading server connections")
 	return nil
 }
diff --git a/vendor/github.com/hashicorp/raft/net_transport.go b/vendor/github.com/hashicorp/raft/net_transport.go
index 7c55ac537..c4d81016d 100644
--- a/vendor/github.com/hashicorp/raft/net_transport.go
+++ b/vendor/github.com/hashicorp/raft/net_transport.go
@@ -177,6 +177,19 @@ func (n *NetworkTransport) Close() error {
 	return nil
 }
 
+func (n *NetworkTransport) Reload() {
+	n.shutdownLock.Lock()
+	defer n.shutdownLock.Unlock()
+
+	if !n.shutdown {
+		close(n.shutdownCh)
+		n.shutdown = true
+	}
+
+	time.Sleep(3 * time.Second)
+	n.shutdownCh = make(chan struct{})
+}
+
 // Consumer implements the Transport interface.
 func (n *NetworkTransport) Consumer() <-chan RPC {
 	return n.consumeCh