- Notifications
You must be signed in to change notification settings - Fork928
feat(cli/exp): add target workspace/users to scaletest commands#11701
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
mafredri merged 4 commits intomainfrommafredri/feat-cli-exp-scaletest-add-workspace-targetsJan 19, 2024
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
Show all changes
4 commits Select commitHold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
90 changes: 80 additions & 10 deletionscli/exp_scaletest.go
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 |
|---|---|---|
| @@ -857,11 +857,12 @@ func (r *RootCmd) scaletestCreateWorkspaces() *clibase.Cmd { | ||
| func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd { | ||
| var ( | ||
| tickInterval time.Duration | ||
| bytesPerTick int64 | ||
| ssh bool | ||
| app string | ||
| template string | ||
| targetWorkspaces string | ||
| client = &codersdk.Client{} | ||
| tracingFlags = &scaletestTracingFlags{} | ||
| @@ -912,6 +913,10 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd { | ||
| return xerrors.Errorf("parse template: %w", err) | ||
| } | ||
| } | ||
| targetWorkspaceStart, targetWorkspaceEnd, err := parseTargetRange("workspaces", targetWorkspaces) | ||
| if err != nil { | ||
| return xerrors.Errorf("parse target workspaces: %w", err) | ||
| } | ||
| appHost, err := client.AppHost(ctx) | ||
| if err != nil { | ||
| @@ -923,9 +928,16 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd { | ||
| return err | ||
| } | ||
| if targetWorkspaceEnd == 0 { | ||
| targetWorkspaceEnd = len(workspaces) | ||
| } | ||
| if len(workspaces) == 0 { | ||
| return xerrors.Errorf("no scaletest workspaces exist") | ||
| } | ||
| if targetWorkspaceEnd > len(workspaces) { | ||
| return xerrors.Errorf("target workspace end %d is greater than the number of workspaces %d", targetWorkspaceEnd, len(workspaces)) | ||
| } | ||
| tracerProvider, closeTracing, tracingEnabled, err := tracingFlags.provider(ctx) | ||
| if err != nil { | ||
| @@ -951,6 +963,10 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd { | ||
| th := harness.NewTestHarness(strategy.toStrategy(), cleanupStrategy.toStrategy()) | ||
| for idx, ws := range workspaces { | ||
| if idx < targetWorkspaceStart || idx >= targetWorkspaceEnd { | ||
| continue | ||
| } | ||
| var ( | ||
| agent codersdk.WorkspaceAgent | ||
| name = "workspace-traffic" | ||
| @@ -1039,6 +1055,12 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd { | ||
| Description: "Name or ID of the template. Traffic generation will be limited to workspaces created from this template.", | ||
| Value: clibase.StringOf(&template), | ||
| }, | ||
| { | ||
| Flag: "target-workspaces", | ||
| Env: "CODER_SCALETEST_TARGET_WORKSPACES", | ||
| Description: "Target a specific range of workspaces in the format [START]:[END] (exclusive). Example: 0:10 will target the 10 first alphabetically sorted workspaces (0-9).", | ||
| Value: clibase.StringOf(&targetWorkspaces), | ||
| }, | ||
| { | ||
| Flag: "bytes-per-tick", | ||
| Env: "CODER_SCALETEST_WORKSPACE_TRAFFIC_BYTES_PER_TICK", | ||
| @@ -1080,10 +1102,11 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *clibase.Cmd { | ||
| func (r *RootCmd) scaletestDashboard() *clibase.Cmd { | ||
| var ( | ||
| interval time.Duration | ||
| jitter time.Duration | ||
| headless bool | ||
| randSeed int64 | ||
| targetUsers string | ||
| client = &codersdk.Client{} | ||
| tracingFlags = &scaletestTracingFlags{} | ||
| @@ -1106,6 +1129,10 @@ func (r *RootCmd) scaletestDashboard() *clibase.Cmd { | ||
| if !(jitter < interval) { | ||
| return xerrors.Errorf("--jitter must be less than --interval") | ||
| } | ||
| targetUserStart, targetUserEnd, err := parseTargetRange("users", targetUsers) | ||
| if err != nil { | ||
| return xerrors.Errorf("parse target users: %w", err) | ||
| } | ||
| ctx := inv.Context() | ||
| logger := inv.Logger.AppendSinks(sloghuman.Sink(inv.Stdout)) | ||
| if r.verbose { | ||
| @@ -1142,8 +1169,15 @@ func (r *RootCmd) scaletestDashboard() *clibase.Cmd { | ||
| if err != nil { | ||
| return xerrors.Errorf("get scaletest users") | ||
| } | ||
| if targetUserEnd == 0 { | ||
| targetUserEnd = len(users) | ||
| } | ||
| for idx, usr := range users { | ||
| if idx < targetUserStart || idx >= targetUserEnd { | ||
| continue | ||
| } | ||
| //nolint:gosec // not used for cryptographic purposes | ||
| rndGen := rand.New(rand.NewSource(randSeed)) | ||
| name := fmt.Sprintf("dashboard-%s", usr.Username) | ||
| @@ -1214,6 +1248,12 @@ func (r *RootCmd) scaletestDashboard() *clibase.Cmd { | ||
| } | ||
| cmd.Options = []clibase.Option{ | ||
| { | ||
| Flag: "target-users", | ||
| Env: "CODER_SCALETEST_DASHBOARD_TARGET_USERS", | ||
| Description: "Target a specific range of users in the format [START]:[END] (exclusive). Example: 0:10 will target the 10 first alphabetically sorted users (0-9).", | ||
| Value: clibase.StringOf(&targetUsers), | ||
| }, | ||
| { | ||
| Flag: "interval", | ||
| Env: "CODER_SCALETEST_DASHBOARD_INTERVAL", | ||
| @@ -1430,6 +1470,36 @@ func parseTemplate(ctx context.Context, client *codersdk.Client, organizationIDs | ||
| return tpl, nil | ||
| } | ||
| func parseTargetRange(name, targets string) (start, end int, err error) { | ||
| if targets == "" { | ||
| return 0, 0, nil | ||
| } | ||
| parts := strings.Split(targets, ":") | ||
| if len(parts) != 2 { | ||
| return 0, 0, xerrors.Errorf("invalid target %s %q", name, targets) | ||
| } | ||
| start, err = strconv.Atoi(parts[0]) | ||
| if err != nil { | ||
| return 0, 0, xerrors.Errorf("invalid target %s %q: %w", name, targets, err) | ||
| } | ||
| end, err = strconv.Atoi(parts[1]) | ||
| if err != nil { | ||
| return 0, 0, xerrors.Errorf("invalid target %s %q: %w", name, targets, err) | ||
| } | ||
| if start == end { | ||
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 check also 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. Good catch 👍🏻 | ||
| return 0, 0, xerrors.Errorf("invalid target %s %q: start and end cannot be equal", name, targets) | ||
| } | ||
| if end < start { | ||
| return 0, 0, xerrors.Errorf("invalid target %s %q: end cannot be less than start", name, targets) | ||
| } | ||
| return start, end, nil | ||
| } | ||
| func createWorkspaceAppConfig(client *codersdk.Client, appHost, app string, workspace codersdk.Workspace, agent codersdk.WorkspaceAgent) (workspacetraffic.AppConfig, error) { | ||
| if app == "" { | ||
| return workspacetraffic.AppConfig{}, nil | ||
48 changes: 48 additions & 0 deletionscli/exp_scaletest_test.go
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
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.