Skip to content

Commit

Permalink
gcp: fix ChunkRetryDeadline deafult value
Browse files Browse the repository at this point in the history
A previous patch made the GCP ChunkRetryDeadline configurable but
incorrectly set the default to a very small value instead of 60seconds.

Fixes: cockroachdb#87677

Release note (bug fix): fix incorrect default value of
`cloudstorage.gs.chunking.retry_timeout` to 60 seconds
  • Loading branch information
adityamaru committed Sep 12, 2022
1 parent 6309178 commit b04c2c6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkg/cloud/gcp/gcs_storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"net/url"
"path"
"strings"
"time"

gcs "cloud.google.com/go/storage"
"github.com/cockroachdb/cockroach/pkg/base"
Expand Down Expand Up @@ -72,7 +73,7 @@ var gcsChunkRetryTimeout = settings.RegisterDurationSetting(
settings.TenantWritable,
"cloudstorage.gs.chunking.retry_timeout",
"per-chunk retry deadline when chunking of file upload to Google Cloud Storage",
60,
60*time.Second,
)

func parseGSURL(_ cloud.ExternalStorageURIContext, uri *url.URL) (cloudpb.ExternalStorage, error) {
Expand Down

0 comments on commit b04c2c6

Please sign in to comment.