Merge #87817

87817: gcp: fix ChunkRetryDeadline default value r=miretskiy a=adityamaru 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 Co-authored-by: adityamaru <[email protected]>
cockroachdb · Sep 12, 2022 · 91f41d5 · 91f41d5
2 parents 6309178 + b04c2c6
commit 91f41d5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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) {