Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport #3138 to v9.6 #3145

Merged
merged 1 commit into from
Oct 9, 2024
Merged

Backport #3138 to v9.6 #3145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions internal/pool/conn.go
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@ package pool
import (
"bufio"
"context"
"crypto/tls"
"net"
"sync/atomic"
"syscall"
@@ -65,9 +64,6 @@ func (cn *Conn) setSysConn() {
if conn == nil {
return
}
if tlsConn, ok := conn.(*tls.Conn); ok {
conn = tlsConn.NetConn()
}

if sysConn, ok := conn.(syscall.Conn); ok {
cn.sysConn = sysConn
20 changes: 0 additions & 20 deletions internal/pool/conn_check_test.go
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@
package pool

import (
"crypto/tls"
"net"
"net/http/httptest"
"syscall"
@@ -16,21 +15,14 @@ import (
var _ = Describe("tests conn_check with real conns", func() {
var ts *httptest.Server
var conn net.Conn
var tlsConn *tls.Conn
var sysConn syscall.Conn
var tlsSysConn syscall.Conn
var err error

BeforeEach(func() {
ts = httptest.NewServer(nil)
conn, err = net.DialTimeout(ts.Listener.Addr().Network(), ts.Listener.Addr().String(), time.Second)
Expect(err).NotTo(HaveOccurred())
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() {
@@ -44,23 +36,11 @@ var _ = Describe("tests conn_check with real conns", func() {
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() {
Expect(conn.Close()).NotTo(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() {
Expect(conn.SetDeadline(time.Now())).NotTo(HaveOccurred())
time.Sleep(time.Millisecond * 10)
Loading