redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-04-19 07:22:17 +03:00
Code

Backport #3138 to v9.6 (#3145)

Browse Source
This commit is contained in:
Francesco Renzi 2024-10-09 06:42:12 +01:00 committed by GitHub
parent c3610cde42
commit 90c7274b01
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/pool/conn.go
View File

@ -3,7 +3,6 @@ package pool
import ( import (
"bufio" "bufio"
"context" "context"
"crypto/tls"
"net" "net"
"sync/atomic" "sync/atomic"
"syscall" "syscall"
@ -65,9 +64,6 @@ func (cn *Conn) setSysConn() {
if conn == nil { if conn == nil {
return return
} }
if tlsConn, ok := conn.(*tls.Conn); ok {
conn = tlsConn.NetConn()
}
if sysConn, ok := conn.(syscall.Conn); ok { if sysConn, ok := conn.(syscall.Conn); ok {
cn.sysConn = sysConn cn.sysConn = sysConn

20
internal/pool/conn_check_test.go
View File

@ -3,7 +3,6 @@
package pool package pool
import ( import (
"crypto/tls"
"net" "net"
"net/http/httptest" "net/http/httptest"
"syscall" "syscall"
@ -16,9 +15,7 @@ import (
var _ = Describe("tests conn_check with real conns", func() { var _ = Describe("tests conn_check with real conns", func() {
var ts *httptest.Server var ts *httptest.Server
var conn net.Conn var conn net.Conn
var tlsConn *tls.Conn
var sysConn syscall.Conn var sysConn syscall.Conn
var tlsSysConn syscall.Conn
var err error var err error
BeforeEach(func() { BeforeEach(func() {
@ -26,11 +23,6 @@ var _ = Describe("tests conn_check with real conns", func() {
conn, err = net.DialTimeout(ts.Listener.Addr().Network(), ts.Listener.Addr().String(), time.Second) conn, err = net.DialTimeout(ts.Listener.Addr().Network(), ts.Listener.Addr().String(), time.Second)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
sysConn = conn.(syscall.Conn) sysConn = conn.(syscall.Conn)
tlsTestServer := httptest.NewUnstartedServer(nil)
tlsTestServer.StartTLS()
tlsConn, err = tls.DialWithDialer(&net.Dialer{Timeout: time.Second}, tlsTestServer.Listener.Addr().Network(), tlsTestServer.Listener.Addr().String(), &tls.Config{InsecureSkipVerify: true})
Expect(err).NotTo(HaveOccurred())
tlsSysConn = tlsConn.NetConn().(syscall.Conn)
}) })
AfterEach(func() { AfterEach(func() {
@ -44,23 +36,11 @@ var _ = Describe("tests conn_check with real conns", func() {
Expect(connCheck(sysConn)).To(HaveOccurred()) Expect(connCheck(sysConn)).To(HaveOccurred())
}) })
It("good tls conn check", func() {
Expect(connCheck(tlsSysConn)).NotTo(HaveOccurred())
Expect(tlsConn.Close()).NotTo(HaveOccurred())
Expect(connCheck(tlsSysConn)).To(HaveOccurred())
})
It("bad conn check", func() { It("bad conn check", func() {
Expect(conn.Close()).NotTo(HaveOccurred()) Expect(conn.Close()).NotTo(HaveOccurred())
Expect(connCheck(sysConn)).To(HaveOccurred()) Expect(connCheck(sysConn)).To(HaveOccurred())
}) })
It("bad tls conn check", func() {
Expect(tlsConn.Close()).NotTo(HaveOccurred())
Expect(connCheck(tlsSysConn)).To(HaveOccurred())
})
It("check conn deadline", func() { It("check conn deadline", func() {
Expect(conn.SetDeadline(time.Now())).NotTo(HaveOccurred()) Expect(conn.SetDeadline(time.Now())).NotTo(HaveOccurred())
time.Sleep(time.Millisecond * 10) time.Sleep(time.Millisecond * 10)