Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[nexus] mark schema tests as heavy, increase timeout for one of them #4832

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .config/nextest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ clickhouse-cluster = { max-threads = 1 }
filter = 'package(oximeter-db) and test(replicated)'
test-group = 'clickhouse-cluster'

[[profile.default.overrides]]
# These tests can time out under heavy contention.
filter = 'binary_id(omicron-nexus::test_all) and test(::schema::)'
threads-required = 4

[[profile.ci.overrides]]
filter = 'binary_id(omicron-nexus::test_all)'
# As of 2023-01-08, the slowest test in test_all takes 196s on a Ryzen 7950X.
Expand Down
6 changes: 5 additions & 1 deletion nexus/tests/integration_tests/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,14 @@ async fn nexus_applies_update_on_boot() {
// Start Nexus. It should auto-format itself to the latest version,
// upgrading through each intermediate update.
//
// The timeout here is a bit longer than usual (120s vs 60s) because if
// lots of tests are running at the same time, there can be contention
// here.
//
// NOTE: If this grows excessively, we could break it into several smaller
// tests.
assert!(
timeout(Duration::from_secs(60), builder.start_nexus_internal())
timeout(Duration::from_secs(120), builder.start_nexus_internal())
.await
.is_ok(),
"Nexus should have started"
Expand Down
Loading