-
Notifications
You must be signed in to change notification settings - Fork 150
Add sharded cloud acceptance test entry point #4743
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
Draft
shreyas-goenka
wants to merge
1
commit into
main
Choose a base branch
from
sharded-tests
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,7 @@ import ( | |
| "errors" | ||
| "flag" | ||
| "fmt" | ||
| "hash/fnv" | ||
| "io" | ||
| "net/http" | ||
| "os" | ||
|
|
@@ -141,6 +142,45 @@ func TestInprocessMode(t *testing.T) { | |
| require.Equal(t, 1, testAccept(t, true, "selftest/server")) | ||
| } | ||
|
|
||
| // shardingConfig holds the sharding parameters when running sharded cloud tests. | ||
| type shardingConfig struct { | ||
| TotalShards int | ||
| ShardIndex int | ||
| } | ||
|
|
||
| // shardConfig is set by TestAcceptCloudSharded before delegating to testAccept. | ||
| // When non-nil, testAccept will skip tests not assigned to this shard. | ||
| var shardConfig *shardingConfig | ||
|
|
||
| // TestAcceptCloudSharded runs a deterministic subset of cloud acceptance tests | ||
| // based on TOTAL_SHARDS and SHARD_INDEX environment variables. Each test | ||
| // (identified by its dir + env variant name) is assigned to exactly one shard | ||
| // via FNV-1a hashing, so all shards together cover the full test suite with no | ||
| // overlap. | ||
| func TestAcceptCloudSharded(t *testing.T) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we just modify TestAccept to respect the env vars if present? |
||
| totalShards, err := strconv.Atoi(os.Getenv("TOTAL_SHARDS")) | ||
| if err != nil || totalShards <= 0 { | ||
| t.Fatal("TOTAL_SHARDS must be set to a positive integer") | ||
| } | ||
| shardIndex, err := strconv.Atoi(os.Getenv("SHARD_INDEX")) | ||
| if err != nil || shardIndex < 0 || shardIndex >= totalShards { | ||
| t.Fatalf("SHARD_INDEX must be in [0, %d)", totalShards) | ||
| } | ||
|
|
||
| shardConfig = &shardingConfig{TotalShards: totalShards, ShardIndex: shardIndex} | ||
| defer func() { shardConfig = nil }() | ||
|
|
||
| testAccept(t, false, "") | ||
| } | ||
|
|
||
| // isTestInShard returns true if the given test name belongs to the current shard | ||
| // based on FNV-1a hashing. | ||
| func isTestInShard(testName string, cfg *shardingConfig) bool { | ||
| h := fnv.New32a() | ||
| _, _ = h.Write([]byte(testName)) | ||
| return int(h.Sum32())%cfg.TotalShards == cfg.ShardIndex | ||
| } | ||
|
|
||
| // Configure replacements for environment variables we read from test environments. | ||
| func setReplsForTestEnvVars(t *testing.T, repls *testdiff.ReplacementsContext) { | ||
| envVars := []string{ | ||
|
|
@@ -335,6 +375,9 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int { | |
| if len(expanded[0]) > 0 { | ||
| t.Logf("Running test with env %v", expanded[0]) | ||
| } | ||
| if shardConfig != nil && !isTestInShard(dir, shardConfig) { | ||
| t.Skipf("Skipping: not assigned to shard %d/%d", shardConfig.ShardIndex, shardConfig.TotalShards) | ||
| } | ||
| runTest(t, dir, 0, coverDir, repls.Clone(), config, expanded[0], envFilters) | ||
| } else { | ||
| for ind, envset := range expanded { | ||
|
|
@@ -343,6 +386,10 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int { | |
| if runParallel { | ||
| t.Parallel() | ||
| } | ||
| shardKey := dir + "/" + envname | ||
| if shardConfig != nil && !isTestInShard(shardKey, shardConfig) { | ||
| t.Skipf("Skipping: not assigned to shard %d/%d", shardConfig.ShardIndex, shardConfig.TotalShards) | ||
| } | ||
| runTest(t, dir, ind, coverDir, repls.Clone(), config, envset, envFilters) | ||
| }) | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Common prefix would be useful to indicate that these are related: TEST_SHARD_TOTAL TEST_SHARD_INDEX