From f9823e29c8dfbae84a4b55cbfcd1772e48250dc1 Mon Sep 17 00:00:00 2001
From: Michael Butler <butler@cockroachlabs.com>
Date: Wed, 29 Oct 2025 18:12:32 -0400
Subject: [PATCH] cloud/amazon: disable s3.client_retry_token_bucket.enabled by
 default

Disabling the client side retry token bucket has made s3 backups at scale more
stable.

Epic: none

Release note: none
---
 pkg/cloud/amazon/s3_storage.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkg/cloud/amazon/s3_storage.go b/pkg/cloud/amazon/s3_storage.go
index c3ef4ff99189..167d6a3cd4d1 100644
--- a/pkg/cloud/amazon/s3_storage.go
+++ b/pkg/cloud/amazon/s3_storage.go
@@ -173,9 +173,7 @@ var enableClientRetryTokenBucket = settings.RegisterBoolSetting(
 	settings.ApplicationLevel,
 	"cloudstorage.s3.client_retry_token_bucket.enabled",
 	"enable the client side retry token bucket in the AWS S3 client",
-	// TODO(jeffswenson): change this to false in a seperate PR. This is false in
-	// the backports to stay true to the backport policy.
-	true)
+	false)
 
 // roleProvider contains fields about the role that needs to be assumed
 // in order to access the external storage.