os.ErrDeadlineExceeded not in Go 1.13

canonical · Aug 26, 2024 · 37edc0b · 37edc0b
1 parent 242d60f
commit 37edc0b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/internal/protocol/connector.go b/internal/protocol/connector.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"net"
-	"os"
 	"sort"
 	"sync"
 	"time"
@@ -264,9 +263,11 @@ func Handshake(ctx context.Context, conn net.Conn, version uint64) (*Protocol, e
 	defer stop()
 
 	// Perform the protocol handshake.
+	// TODO: this should be a message and use same code for writing and reading
+	// to the network.
 	n, err := conn.Write(protocol)
 	if err != nil {
-		if canceled && errors.Is(err, os.ErrDeadlineExceeded) {
+		if canceled && errors.Cause(err).(net.Error).Timeout() {
 			return nil, errors.Wrap(err, "write handshake")
 		}
 		return nil, errors.Wrap(err, "write handshake")

diff --git a/internal/protocol/protocol.go b/internal/protocol/protocol.go
@@ -5,7 +5,6 @@ import (
 	"encoding/binary"
 	"io"
 	"net"
-	"os"
 	"sync"
 	"time"
 
@@ -76,14 +75,14 @@ func (p *Protocol) Call(ctx context.Context, request, response *Message) (err er
 	desc := requestDesc(request.mtype)
 
 	if err = p.send(request); err != nil {
-		if canceled && errors.Is(err, os.ErrDeadlineExceeded) {
+		if canceled && errors.Cause(err).(net.Error).Timeout() {
 			return errors.Wrapf(err, "call %s (canceled): send", desc)
 		}
 		return errors.Wrapf(err, "call %s (budget %s): send", desc, budget)
 	}
 
 	if err = p.recv(response); err != nil {
-		if canceled && errors.Is(err, os.ErrDeadlineExceeded) {
+		if canceled && errors.Cause(err).(net.Error).Timeout() {
 			return errors.Wrapf(err, "call %s (canceled): receive", desc)
 		}
 		return errors.Wrapf(err, "call %s (budget %s): receive", desc, budget)
@@ -125,16 +124,18 @@ func (p *Protocol) Interrupt(ctx context.Context, request *Message, response *Me
 
 	EncodeInterrupt(request, 0)
 
+	// TODO: the context cancelation and honoring should happen in the protocol
+	// primitives which can be tested better.
 	if err := p.send(request); err != nil {
-		if canceled && errors.Is(err, os.ErrDeadlineExceeded) {
+		if canceled && errors.Cause(err).(net.Error).Timeout() {
 			return errors.Wrapf(err, "interrupt request (canceled): send")
 		}
 		return errors.Wrapf(err, "interrupt request (budget %s): send", budget)
 	}
 
 	for {
 		if err := p.recv(response); err != nil {
-			if canceled && errors.Is(err, os.ErrDeadlineExceeded) {
+			if canceled && errors.Cause(err).(net.Error).Timeout() {
 				return errors.Wrapf(err, "interrupt request (canceled): receive")
 			}
 			return errors.Wrapf(err, "interrupt request (budget %s): receive", budget)