Don't backoff if a listener error was a timeout (hashicorp#11594)

rerorero · May 13, 2021 · a71eebe · a71eebe
1 parent 0ef6145
commit a71eebe
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/vault/cluster/cluster.go b/vault/cluster/cluster.go
@@ -301,12 +301,17 @@ func (cl *Listener) Run(ctx context.Context) error {
 				// Accept the connection
 				conn, err := tlsLn.Accept()
 				if err != nil {
-					if err, ok := err.(net.Error); ok && !err.Timeout() {
+					err, ok := err.(net.Error)
+					if ok && !err.Timeout() {
 						cl.logger.Debug("non-timeout error accepting on cluster port", "error", err)
 					}
 					if conn != nil {
 						conn.Close()
 					}
+					if ok && err.Timeout() {
+						loopDelay = 0
+						continue
+					}
 
 					if loopDelay == 0 {
 						loopDelay = baseDelay