Revert "rpc: attempt to fix ping/pong logic race (#27733)"

This reverts commit 7588f79bd8.

rpc/websocket.go

@@ -278,21 +278,24 @@ type websocketCodec struct {
 	conn *websocket.Conn
 	info PeerInfo
 
-	wg           sync.WaitGroup
+	wg        sync.WaitGroup
-	pingReset    chan struct{}
+	pingReset chan struct{}
-	pongReceived chan struct{}
 }
 
 func newWebsocketCodec(conn *websocket.Conn, host string, req http.Header) ServerCodec {
 	conn.SetReadLimit(wsMessageSizeLimit)
+	conn.SetPongHandler(func(appData string) error {
+		conn.SetReadDeadline(time.Time{})
+		return nil
+	})
+
 	encode := func(v interface{}, isErrorResponse bool) error {
 		return conn.WriteJSON(v)
 	}
 	wc := &websocketCodec{
-		jsonCodec:    NewFuncCodec(conn, encode, conn.ReadJSON).(*jsonCodec),
+		jsonCodec: NewFuncCodec(conn, encode, conn.ReadJSON).(*jsonCodec),
-		conn:         conn,
+		conn:      conn,
-		pingReset:    make(chan struct{}, 1),
+		pingReset: make(chan struct{}, 1),
-		pongReceived: make(chan struct{}),
 		info: PeerInfo{
 			Transport:  "ws",
 			RemoteAddr: conn.RemoteAddr().String(),
@@ -303,13 +306,6 @@ func newWebsocketCodec(conn *websocket.Conn, host string, req http.Header) Serve
 	wc.info.HTTP.Origin = req.Get("Origin")
 	wc.info.HTTP.UserAgent = req.Get("User-Agent")
 	// Start pinger.
-	conn.SetPongHandler(func(appData string) error {
-		select {
-		case wc.pongReceived <- struct{}{}:
-		case <-wc.closed():
-		}
-		return nil
-	})
 	wc.wg.Add(1)
 	go wc.pingLoop()
 	return wc
@@ -338,31 +334,26 @@ func (wc *websocketCodec) writeJSON(ctx context.Context, v interface{}, isError
 
 // pingLoop sends periodic ping frames when the connection is idle.
 func (wc *websocketCodec) pingLoop() {
-	var pingTimer = time.NewTimer(wsPingInterval)
+	var timer = time.NewTimer(wsPingInterval)
 	defer wc.wg.Done()
-	defer pingTimer.Stop()
+	defer timer.Stop()
 
 	for {
 		select {
 		case <-wc.closed():
 			return
-
 		case <-wc.pingReset:
-			if !pingTimer.Stop() {
+			if !timer.Stop() {
-				<-pingTimer.C
+				<-timer.C
 			}
-			pingTimer.Reset(wsPingInterval)
+			timer.Reset(wsPingInterval)
-
+		case <-timer.C:
-		case <-pingTimer.C:
 			wc.jsonCodec.encMu.Lock()
 			wc.conn.SetWriteDeadline(time.Now().Add(wsPingWriteTimeout))
 			wc.conn.WriteMessage(websocket.PingMessage, nil)
 			wc.conn.SetReadDeadline(time.Now().Add(wsPongTimeout))
 			wc.jsonCodec.encMu.Unlock()
-			pingTimer.Reset(wsPingInterval)
+			timer.Reset(wsPingInterval)
-
-		case <-wc.pongReceived:
-			wc.conn.SetReadDeadline(time.Time{})
 		}
 	}
 }