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): configurable retries for uploads #5210

Merged
merged 8 commits into from Dec 23, 2021
Merged

feat(storage): configurable retries for uploads #5210

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1d1fe4d
feat(storage): configurable retries for uploads
tritone Dec 9, 2021
0515116
update idempotency condition
tritone Dec 13, 2021
05976fd
update emulator script
tritone Dec 14, 2021
a14d437
Merge branch 'main' into main
tritone Dec 23, 2021
58baa0f
remove regex for passing tests
tritone Dec 23, 2021
72fd488
Merge branch 'main' into main
tritone Dec 23, 2021
5c4b8a4
Merge branch 'main' into main
tritone Dec 23, 2021
bed1369
Merge branch 'main' into main
tritone Dec 23, 2021
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
59 changes: 1 addition & 58 deletions storage/emulator_test.sh
View file
Open in desktop
Expand Up @@ -67,62 +67,5 @@ function cleanup() {
}
trap cleanup EXIT

# TODO: move to passing once fixed
FAILING=(
"objects.insert"
)
# TODO: remove regex once all tests are passing
# Unfortunately, there is no simple way to skip specific tests (see https://github.com/golang/go/issues/41583)
# Therefore, we have to simply run all the specific tests we know pass
PASSING=( "buckets.list"
"buckets.insert"
"buckets.get"
"buckets.delete"
"buckets.update"
"buckets.patch"
"buckets.getIamPolicy"
"buckets.setIamPolicy"
"buckets.testIamPermissions"
"buckets.lockRetentionPolicy"
"objects.copy"
"objects.get"
"objects.list"
"objects.delete"
"objects.update"
"objects.patch"
"objects.compose"
"objects.rewrite"
"serviceaccount.get"
"hmacKey.get"
"hmacKey.list"
"hmacKey.create"
"hmacKey.delete"
"hmacKey.update"
"notifications.list"
"notifications.create"
"notifications.get"
"notifications.delete"
"object_acl.insert"
"object_acl.get"
"object_acl.list"
"object_acl.patch"
"object_acl.update"
"object_acl.delete"
"default_object_acl.insert"
"default_object_acl.get"
"default_object_acl.list"
"default_object_acl.patch"
"default_object_acl.update"
"default_object_acl.delete"
"bucket_acl.insert"
"bucket_acl.get"
"bucket_acl.list"
"bucket_acl.patch"
"bucket_acl.update"
"bucket_acl.delete"
)
TEMP=${PASSING[@]}
PASSING_REGEX=${TEMP// /|}

# Run tests
go test -v -timeout 10m ./ -run="TestRetryConformance/($PASSING_REGEX)-" -short 2>&1 | tee -a sponge_log.log
go test -v -timeout 10m ./ -run="TestRetryConformance" -short 2>&1 | tee -a sponge_log.log
16 changes: 16 additions & 0 deletions storage/writer.go
View file
Open in desktop
Expand Up @@ -172,6 +172,22 @@ func (w *Writer) open() error {
// call to set up the upload as well as calls to upload individual chunks
// for a resumable upload (as long as the chunk size is non-zero). Hence
// there is no need to add retries here.

// Retry only when the operation is idempotent or the retry policy is RetryAlways.
isIdempotent := w.o.conds != nil && (w.o.conds.GenerationMatch >= 0 || w.o.conds.DoesNotExist == true)
var useRetry bool
if (w.o.retry == nil || w.o.retry.policy == RetryIdempotent) && isIdempotent {
useRetry = true
} else if w.o.retry != nil && w.o.retry.policy == RetryAlways {
useRetry = true
}
if useRetry {
if w.o.retry != nil {
call.WithRetry(w.o.retry.backoff, w.o.retry.shouldRetry)
} else {
call.WithRetry(nil, nil)
}
}
resp, err = call.Do()
}
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion storage/writer_test.go
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ func TestErrorOnObjectsInsertCall(t *testing.T) {

doWrite := func(mt *mockTransport) *Writer {
client := mockClient(t, mt)
wc := client.Bucket("bucketname").Object("filename1").NewWriter(ctx)
wc := client.Bucket("bucketname").Object("filename1").If(Conditions{DoesNotExist: true}).NewWriter(ctx)
wc.ContentType = "text/plain"

// We can't check that the Write fails, since it depends on the write to the
Expand Down