From d3877990ece2e88ab921125b13396bfe60e6d996 Mon Sep 17 00:00:00 2001
From: "Scott G. Miller" <smiller@hashicorp.com>
Date: Wed, 12 May 2021 11:24:25 -0500
Subject: [PATCH] Don't backoff if a listener error was a timeout

---
 vault/cluster/cluster.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/vault/cluster/cluster.go b/vault/cluster/cluster.go
index 016e73c32abd..7b5c47cfb129 100644
--- 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