Issue #23: Request should be retried also on ECONNABORTED and ECONNREFUSED

Author: gildas

request.go

@@ -120,7 +120,7 @@ func Send(options *Options, results interface{}) (*Content, error) {
 		log = log.Record("duration", reqDuration/time.Millisecond)
 		if err != nil {
 			netErr := &net.OpError{}
-			if errors.As(err, &netErr) && errors.Is(netErr, syscall.ECONNRESET) {
+			if errors.As(err, &netErr) && (errors.Is(netErr, syscall.ECONNRESET) || errors.Is(netErr, syscall.ECONNABORTED) || errors.Is(netErr, syscall.ECONNREFUSED)) {
 				if attempt+1 < options.Attempts {
 					log.Warnf("Temporary failed to send request (duration: %s/%s), Error: %s", reqDuration, options.Timeout, err.Error()) // we don't want the stack here
 					log.Infof("Waiting for %s before trying again", options.InterAttemptDelay)

request_test.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -717,6 +718,52 @@ func (suite *RequestSuite) TestCanRetryReceivingRequestECONNRESET() {
 	suite.Require().NoError(err, "Failed reading response content, err=%+v", err)
 }
 
+func (suite *RequestSuite) TestCanRetryReceivingRequestECONNREFUSED() {
+	// Start the client in a separate goroutine
+	go func() {
+		serverURL, _ := url.Parse("http://localhost:1234")
+		response, err := request.Send(&request.Options{
+			URL:      serverURL,
+			Attempts: 2,
+			Timeout:  1 * time.Second,
+			Logger:   suite.Logger,
+		}, nil)
+		suite.Require().NoError(err, "Failed reading response content, err=%+v", err)
+		suite.Assert().Equal("body", string(response.Data))
+	}()
+
+	listener, err := net.Listen("tcp", ":1234")
+	suite.Require().NoError(err, "Failed starting the listener")
+	listener.Close() // that will cause the ECONNREFUSED
+	time.Sleep(2 * time.Second)
+
+	listener, err = net.Listen("tcp", ":1234")
+	suite.Require().NoError(err, "Failed starting the listener")
+	defer listener.Close()
+
+	// accept the connection
+	conn, err := listener.Accept()
+	suite.Require().NoError(err, "Failed accepting the connection")
+	defer conn.Close()
+
+	_, _ = conn.Write([]byte("HTTP/1.1 200 OK\r\nContent-Length: 4\r\n\r\nbody"))
+	time.Sleep(1 * time.Second)
+}
+
+func (suite *RequestSuite) TestCanRetryReceivingRequestECONNABORTED() {
+	server := CreateEConnAbortedTestServer(suite, 3)
+	defer server.Close()
+
+	serverURL, _ := url.Parse(server.URL)
+	_, err := request.Send(&request.Options{
+		URL:      serverURL,
+		Attempts: 5,
+		Timeout:  1 * time.Second,
+		Logger:   suite.Logger,
+	}, nil)
+	suite.Require().NoError(err, "Failed reading response content")
+}
+
 func (suite *RequestSuite) TestCanRetryReceivingRequestEOF() {
 	serverURL, _ := url.Parse(suite.Server.URL)
 	serverURL, _ = serverURL.Parse("/retry_eof")

server_test.go

@@ -428,3 +428,17 @@ func CreateEConnResetTestServer(suite *RequestSuite, maxResets int) *httptest.Se
 	testserver.Start()
 	return testserver
 }
+
+func CreateEConnAbortedTestServer(suite *RequestSuite, failAttempts int) *httptest.Server {
+	attempts := 0
+	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if attempts < failAttempts {
+			attempts++
+			conn, _, _ := w.(http.Hijacker).Hijack()
+			conn.Close() // This will cause ECONNABORTED
+			return
+		}
+		w.WriteHeader(http.StatusOK)
+		_, _ = w.Write([]byte("OK"))
+	}))
+}