redis · ndyakov · Jun 26, 2025 · Jun 26, 2025 · Jun 26, 2025 · Jun 26, 2025
diff --git a/bench_decode_test.go b/bench_decode_test.go
diff --git a/commands_test.go b/commands_test.go
@@ -2948,7 +2948,8 @@ var _ = Describe("Commands", func() {
 
 			res, err = client.HPTTL(ctx, "myhash", "key1", "key2", "key200").Result()
 			Expect(err).NotTo(HaveOccurred())
-			Expect(res[0]).To(BeNumerically("~", 10*time.Second.Milliseconds(), 1))
+			// overhead of the push notification check is about 1-2ms for 100 commands
+			Expect(res[0]).To(BeNumerically("~", 10*time.Second.Milliseconds(), 2))
 		})
 
 		It("should HGETDEL", Label("hash", "HGETDEL"), func() {

diff --git a/internal/pool/conn.go b/internal/pool/conn.go
@@ -58,6 +58,10 @@ func (cn *Conn) SetNetConn(netConn net.Conn) {
 	cn.bw.Reset(netConn)
 }
 
+func (cn *Conn) GetNetConn() net.Conn {
+	return cn.netConn
+}
+
 func (cn *Conn) Write(b []byte) (int, error) {
 	return cn.netConn.Write(b)
 }
@@ -77,6 +81,7 @@ func (cn *Conn) WithReader(
 			return err
 		}
 	}
+
 	return fn(cn.rd)
 }
 

diff --git a/internal/pool/conn_check.go b/internal/pool/conn_check.go
@@ -12,6 +12,9 @@ import (
 
 var errUnexpectedRead = errors.New("unexpected read from socket")
 
+// connCheck checks if the connection is still alive and if there is data in the socket
+// it will try to peek at the next byte without consuming it since we may want to work with it
+// later on (e.g. push notifications)
 func connCheck(conn net.Conn) error {
 	// Reset previous timeout.
 	_ = conn.SetDeadline(time.Time{})
@@ -29,7 +32,9 @@ func connCheck(conn net.Conn) error {
 
 	if err := rawConn.Read(func(fd uintptr) bool {
 		var buf [1]byte
-		n, err := syscall.Read(int(fd), buf[:])
+		// Use MSG_PEEK to peek at data without consuming it
+		n, _, err := syscall.Recvfrom(int(fd), buf[:], syscall.MSG_PEEK|syscall.MSG_DONTWAIT)
-		// Use MSG_PEEK to peek at data without consuming it
-		n, _, err := syscall.Recvfrom(int(fd), buf[:], syscall.MSG_PEEK|syscall.MSG_DONTWAIT)
+		// Use syscall.Read to check connection health without peeking
+		n, err := syscall.Read(int(fd), buf[:])
-		// Use MSG_PEEK to peek at data without consuming it
-		n, _, err := syscall.Recvfrom(int(fd), buf[:], syscall.MSG_PEEK|syscall.MSG_DONTWAIT)
+		// Use syscall.Read to check connection health without peeking
+		n, err := syscall.Read(int(fd), buf[:])
+
 		switch {
 		case n == 0 && err == nil:
 			sysErr = io.EOF