Skip to content

Commit b8f58ab

Browse files
craig[bot]msbutler
andcommitted
Merge #156496
156496: cloud/amazon: disable s3.client_retry_token_bucket.enabled by default r=jeffswenson a=msbutler Disabling the client side retry token bucket has made s3 backups at scale more stable. Epic: none Release note: none Co-authored-by: Michael Butler <butler@cockroachlabs.com>
2 parents 963f675 + f9823e2 commit b8f58ab

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

pkg/cloud/amazon/s3_storage.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,7 @@ var enableClientRetryTokenBucket = settings.RegisterBoolSetting(
173173
settings.ApplicationLevel,
174174
"cloudstorage.s3.client_retry_token_bucket.enabled",
175175
"enable the client side retry token bucket in the AWS S3 client",
176-
// TODO(jeffswenson): change this to false in a seperate PR. This is false in
177-
// the backports to stay true to the backport policy.
178-
true)
176+
false)
179177

180178
// roleProvider contains fields about the role that needs to be assumed
181179
// in order to access the external storage.

0 commit comments

Comments
 (0)