From 583e50d0087c3d9856f8c5f6324f44e2050ca93a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arda=20G=C3=BC=C3=A7l=C3=BC?= <aguclu@redhat.com>
Date: Fri, 6 Oct 2023 08:55:22 +0300
Subject: [PATCH] Use timeout function to detect transient errors

Kubernetes-commit: a888fef242fd59bc3871c67099c7f5e9449873c2
---
 tools/remotecommand/websocket.go | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tools/remotecommand/websocket.go b/tools/remotecommand/websocket.go
index 4d9814a8..48e52092 100644
--- a/tools/remotecommand/websocket.go
+++ b/tools/remotecommand/websocket.go
@@ -18,8 +18,10 @@ package remotecommand
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
+	"net"
 	"net/http"
 	"sync"
 	"time"
@@ -476,12 +478,18 @@ func (h *heartbeat) start() {
 				klog.V(8).Infof("Websocket Ping succeeeded")
 			} else {
 				klog.Errorf("Websocket Ping failed: %v", err)
-				if gwebsocket.IsUnexpectedCloseError(err, gwebsocket.CloseGoingAway, gwebsocket.CloseAbnormalClosure) {
-					return
+				if errors.Is(err, gwebsocket.ErrCloseSent) {
+					// we continue because c.conn.CloseChan will manage closing the connection already
+					continue
+				} else if e, ok := err.(net.Error); ok && e.Timeout() {
+					// Continue, in case this is a transient failure.
+					// c.conn.CloseChan above will tell us when the connection is
+					// actually closed.
+					// If Temporary function hadn't been deprecated, we would have used it.
+					// But most of temporary errors are timeout errors anyway.
+					continue
 				}
-				// Continue, in case this is a transient failure.
-				// c.conn.CloseChan above will tell us when the connection is
-				// actually closed.
+				return
 			}
 		}
 	}