Skip to content

Commit 78a1681

Browse files
craig[bot]msbutlerwenyihu6
committed
155535: roachtest: deflake azure backup fixture roachtest r=dt a=msbutler I suspect our azure external storage reader doesn't currently retry read timeouts. This patch disables the timeout to see if that deflakes the test. Once I've confirmed the root cause, i'll think through a fix. Informs #155427 Release note: none 155544: kvclient/rangefeed: use larger machine for test runner r=stevendanna a=wenyihu6 This commit updates kv/kvclient/rangefeed to use a larger machine for its test runner under race, as TestRangefeedCatchupStarvation previously hit an OOM under race and appears to be related to an infra flake. Fixes: #155334 Epic: none Release note: none Co-authored-by: Michael Butler <butler@cockroachlabs.com> Co-authored-by: wenyihu6 <wenyi@cockroachlabs.com>
3 parents 81fd236 + 54b4950 + 8baa4ff commit 78a1681

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

pkg/cmd/roachtest/tests/backup_fixtures.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ func (bd *backupDriver) prepareCluster(ctx context.Context) {
195195
"kv.snapshot_rebalance.max_rate": "256 MiB",
196196
"server.debug.default_vmodule": "s3_storage=2",
197197
"cloudstorage.s3.client_retry_token_bucket.enabled": "false",
198+
"cloudstorage.azure.try.timeout": "0s",
198199
},
199200
install.EnvOption{
200201
fmt.Sprintf("COCKROACH_AZURE_APPLICATION_CREDENTIALS_FILE=%s", azureCredentialsFilePath),

pkg/kv/kvclient/rangefeed/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@ go_test(
6060
":mock_rangefeed", # keep
6161
],
6262
embed = [":rangefeed"],
63+
exec_properties = select({
64+
"//build/toolchains:is_heavy": {"test.Pool": "large"},
65+
"//conditions:default": {"test.Pool": "default"},
66+
}),
6367
deps = [
6468
"//pkg/base",
6569
"//pkg/keys",

0 commit comments

Comments
 (0)