From b04c2c6a1872f8923037b96d76c5b583cc09fc01 Mon Sep 17 00:00:00 2001 From: adityamaru Date: Mon, 12 Sep 2022 09:04:48 -0400 Subject: [PATCH] gcp: fix ChunkRetryDeadline deafult value A previous patch made the GCP ChunkRetryDeadline configurable but incorrectly set the default to a very small value instead of 60seconds. Fixes: #87677 Release note (bug fix): fix incorrect default value of `cloudstorage.gs.chunking.retry_timeout` to 60 seconds --- pkg/cloud/gcp/gcs_storage.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/cloud/gcp/gcs_storage.go b/pkg/cloud/gcp/gcs_storage.go index 62ba988508c7..7873df26bd32 100644 --- a/pkg/cloud/gcp/gcs_storage.go +++ b/pkg/cloud/gcp/gcs_storage.go @@ -18,6 +18,7 @@ import ( "net/url" "path" "strings" + "time" gcs "cloud.google.com/go/storage" "github.com/cockroachdb/cockroach/pkg/base" @@ -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) {