test2

Signed-off-by: monkey <[email protected]>

Author: monkey92t

internal/pool/conn.go

@@ -3,8 +3,10 @@ package pool
 import (
 	"bufio"
 	"context"
+	"crypto/tls"
 	"net"
 	"sync/atomic"
+	"syscall"
 	"time"
 
 	"github.com/redis/go-redis/v9/internal/proto"
@@ -17,7 +19,7 @@ type Conn struct {
 	netConn net.Conn
 
 	// for checking the health status of the connection, it may be nil.
-	//sysConn syscall.Conn
+	sysConn syscall.Conn
 
 	rd *proto.Reader
 	bw *bufio.Writer
@@ -58,18 +60,18 @@ func (cn *Conn) SetNetConn(netConn net.Conn) {
 }
 
 func (cn *Conn) setRawConn() {
-	//cn.sysConn = nil
-	//conn := cn.netConn
-	//if conn == nil {
-	//	return
-	//}
-	//if tlsConn, ok := conn.(*tls.Conn); ok {
-	//	conn = tlsConn.NetConn()
-	//}
-	//
-	//if sysConn, ok := conn.(syscall.Conn); ok {
-	//	cn.sysConn = sysConn
-	//}
+	cn.sysConn = nil
+	conn := cn.netConn
+	if conn == nil {
+		return
+	}
+	if tlsConn, ok := conn.(*tls.Conn); ok {
+		conn = tlsConn.NetConn()
+	}
+
+	if sysConn, ok := conn.(syscall.Conn); ok {
+		cn.sysConn = sysConn
+	}
 }
 
 func (cn *Conn) Write(b []byte) (int, error) {
@@ -115,7 +117,7 @@ func (cn *Conn) WithWriter(
 }
 
 func (cn *Conn) Close() error {
-	//cn.sysConn = nil
+	cn.sysConn = nil
 	return cn.netConn.Close()
 }
 

internal/pool/conn_check.go

@@ -3,28 +3,25 @@
 package pool
 
 import (
-	"crypto/tls"
 	"errors"
 	"io"
-	"net"
 	"syscall"
-	"time"
 )
 
 var errUnexpectedRead = errors.New("unexpected read from socket")
 
-func connCheck(conn net.Conn) error {
-	// Reset previous timeout.
-	_ = conn.SetDeadline(time.Time{})
-
-	// Check if tls.Conn.
-	if c, ok := conn.(*tls.Conn); ok {
-		conn = c.NetConn()
-	}
-	sysConn, ok := conn.(syscall.Conn)
-	if !ok {
-		return nil
-	}
+func connCheck(sysConn syscall.Conn) error {
+	//// Reset previous timeout.
+	//_ = conn.SetDeadline(time.Time{})
+	//
+	//// Check if tls.Conn.
+	//if c, ok := conn.(*tls.Conn); ok {
+	//	conn = c.NetConn()
+	//}
+	//sysConn, ok := conn.(syscall.Conn)
+	//if !ok {
+	//	return nil
+	//}
 	rawConn, err := sysConn.SyscallConn()
 	if err != nil {
 		return err

internal/pool/conn_check_dummy.go

@@ -3,9 +3,9 @@
 package pool
 
 import (
-	"net"
+	"syscall"
 )
 
-func connCheck(_ net.Conn) error {
+func connCheck(_ syscall.Conn) error {
 	return nil
 }

internal/pool/pool.go

@@ -518,7 +518,7 @@ func (p *ConnPool) isHealthyConn(cn *Conn) bool {
 	//		return false
 	//	}
 	//}
-	if connCheck(cn.netConn) != nil {
+	if connCheck(cn.sysConn) != nil {
 		return false
 	}