Skip to content

Commit ea6c150

Browse files
committed
azure: set default of cloudstorage.azure.try.timeout to 0
This setting was previously set to 1m to deflake the TestAzureFaultInjection unit test, but unfortunately this also led to production backup flakes in the azure backup roachtest. Instead of reenabling this setting, we should to teach the resuming reader to time out hanging reads (reference issue #159098) Epic: none Release note: none
1 parent 0dfe683 commit ea6c150

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

pkg/cloud/azure/azure_storage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var tryTimeout = settings.RegisterDurationSetting(
5555
settings.ApplicationLevel,
5656
"cloudstorage.azure.try.timeout",
5757
"the timeout for individual retry attempts in Azure operations",
58-
60*time.Second)
58+
0)
5959

6060
var reuseSession = settings.RegisterBoolSetting(
6161
settings.ApplicationLevel,

pkg/cloud/azure/azure_storage_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,9 @@ func TestAzureFaultInjection(t *testing.T) {
176176
conf, err := cloud.ExternalStorageConfFromURI(uri, username.RootUserName())
177177
require.NoError(t, err)
178178

179+
settings := cluster.MakeTestingClusterSettings()
180+
tryTimeout.Override(context.Background(), &settings.SV, time.Minute)
181+
179182
args := cloud.EarlyBootExternalStorageContext{
180183
IOConf: base.ExternalIODirConfig{},
181184
Settings: cluster.MakeTestingClusterSettings(),

pkg/cmd/roachtest/tests/backup_fixtures.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ func (bd *backupDriver) prepareCluster(ctx context.Context) {
181181
"kv.snapshot_rebalance.max_rate": "256 MiB",
182182
"server.debug.default_vmodule": "s3_storage=2",
183183
"cloudstorage.s3.client_retry_token_bucket.enabled": "false",
184-
"cloudstorage.azure.try.timeout": "0s",
185184
},
186185
))
187186
}

0 commit comments

Comments
 (0)