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

Jump to bottom

feat(storage): add net.ErrClosed to default retry #5384

Merged
merged 6 commits into from Jan 25, 2022
Merged

feat(storage): add net.ErrClosed to default retry #5384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f78639d
feat(storage): add net.ErrClosed to default retry
BrennaEpp Jan 20, 2022
ed39c2d
correct comment
BrennaEpp Jan 20, 2022
f70f182
change to string matching
BrennaEpp Jan 21, 2022
1680188
separate test to go116
BrennaEpp Jan 21, 2022
db5dab1
add TODOs
BrennaEpp Jan 24, 2022
47a3451
Merge branch 'main' into retry-errclosed
tritone Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions storage/invoke.go
View file
Open in desktop
Expand Up @@ -17,11 +17,13 @@ package storage
import (
"context"
"io"
"net"
"net/url"
"strings"

"cloud.google.com/go/internal"
gax "github.com/googleapis/gax-go/v2"
"golang.org/x/xerrors"
"google.golang.org/api/googleapi"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
Expand Down Expand Up @@ -59,16 +61,22 @@ func shouldRetry(err error) bool {
if err == nil {
return false
}
if err == io.ErrUnexpectedEOF {
if xerrors.Is(err, io.ErrUnexpectedEOF) {
return true
}

switch e := err.(type) {
case *net.OpError:
if strings.Contains(e.Error(), "use of closed network connection") {
// TODO: check against net.ErrClosed (go 1.16+) instead of string
return true
}
case *googleapi.Error:
// Retry on 408, 429, and 5xx, according to
// https://cloud.google.com/storage/docs/exponential-backoff.
return e.Code == 408 || e.Code == 429 || (e.Code >= 500 && e.Code < 600)
case *url.Error:
// Retry socket-level errors ECONNREFUSED and ENETUNREACH (from syscall).
// Retry socket-level errors ECONNREFUSED and ECONNRESET (from syscall).
// Unfortunately the error type is unexported, so we resort to string
// matching.
retriable := []string{"connection refused", "connection reset"}
Expand Down
7 changes: 7 additions & 0 deletions storage/invoke_test.go
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@ import (
"context"
"errors"
"io"
"net"
"net/url"
"testing"

Expand Down Expand Up @@ -263,6 +264,12 @@ func TestShouldRetry(t *testing.T) {
inputErr: status.Error(codes.PermissionDenied, "non-retryable gRPC error"),
shouldRetry: false,
},
{
desc: "wrapped ErrClosed text",
// TODO: check directly against wrapped net.ErrClosed (go 1.16+)
inputErr: &net.OpError{Op: "write", Err: errors.New("use of closed network connection")},
shouldRetry: true,
},
} {
t.Run(test.desc, func(s *testing.T) {
got := shouldRetry(test.inputErr)
Expand Down