Retry on closed connection (#189)

* retry-on-closed-connection * add test for closed network connection * update name of the test
peak · Jul 21, 2020 · a4865c1 · a4865c1
1 parent 582a86d
commit a4865c1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/storage/s3.go b/storage/s3.go
@@ -656,6 +656,11 @@ func (c *customRetryer) ShouldRetry(req *request.Request) bool {
 	if errHasCode(req.Error, "InternalError") {
 		return true
 	}
+
+	if errContains(req.Error, "use of closed network connection") {
+		return true
+	}
+
 	return c.DefaultRetryer.ShouldRetry(req)
 }
 
@@ -701,6 +706,21 @@ func errHasCode(err error, code string) bool {
 
 }
 
+func errContains(err error, msg string) bool {
+	if err == nil || msg == "" {
+		return false
+	}
+
+	var awsErr awserr.Error
+	if errors.As(err, &awsErr) {
+		if strings.Contains(awsErr.Error(), msg) {
+			return true
+		}
+	}
+
+	return false
+}
+
 // IsCancelationError reports whether given error is a storage related
 // cancelation error.
 func IsCancelationError(err error) bool {

diff --git a/storage/s3_test.go b/storage/s3_test.go
@@ -293,6 +293,10 @@ func TestS3Retry(t *testing.T) {
 			name: "RequestError",
 			err:  awserr.New(request.ErrCodeRequestError, "request error", nil),
 		},
+		{
+			name: "UseOfClosedNetworkConnection",
+			err:  awserr.New(request.ErrCodeRequestError, "use of closed network connection", nil),
+		},
 		{
 			name: "RequestFailureRequestError",
 			err: awserr.NewRequestFailure(