-
Notifications
You must be signed in to change notification settings - Fork 137
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* Plumbing queue cordoning into armadactl * Making armadactl cordoning commands more intuitive, some formatting changes * Formatting * Making queue get more intuitive * Correcting comments and error messages * Removing single queue cordoning code in favour of cobra alias. Adding only-cordoned flag when fetching queues * Removing unused methods * Removing method prefix from error messages * Fixing import order Co-authored-by: Mustafa Ilyas <[email protected]>
- Loading branch information
1 parent
58f8ea8
commit 9608591
Showing
11 changed files
with
474 additions
and
6 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| "github.com/armadaproject/armada/internal/armadactl" | ||
| "github.com/armadaproject/armada/internal/common/slices" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| func cordon() *cobra.Command { | ||
| a := armadactl.New() | ||
| cmd := &cobra.Command{ | ||
| Use: "cordon", | ||
| Short: "Pause scheduling by resource", | ||
| Long: "Pause scheduling by resource. Supported: queue, queues", | ||
| } | ||
| cmd.AddCommand(cordonQueues(a)) | ||
| return cmd | ||
| } | ||
|
|
||
| func uncordon() *cobra.Command { | ||
| a := armadactl.New() | ||
| cmd := &cobra.Command{ | ||
| Use: "uncordon", | ||
| Short: "Resume scheduling by resource", | ||
| Long: "Resume scheduling by resource. Supported: queue, queues", | ||
| } | ||
| cmd.AddCommand(uncordonQueues(a)) | ||
| return cmd | ||
| } | ||
|
|
||
| func cordonQueues(a *armadactl.App) *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "queues <queue_1> <queue_2> <queue_3> ...", | ||
| Aliases: []string{"queue"}, | ||
| Short: "Pause scheduling for select queues", | ||
| Long: "Pause scheduling for select queues. This can be achieved either by queue names or by labels.", | ||
| PreRunE: func(cmd *cobra.Command, args []string) error { | ||
| return initParams(cmd, a.Params) | ||
| }, | ||
| RunE: func(cmd *cobra.Command, queues []string) error { | ||
| errs := slices.Filter(slices.Map(queues, queueNameValidation), func(err error) bool { return err != nil }) | ||
| if len(errs) > 0 { | ||
| return fmt.Errorf("provided queue name invalid: %s", errs[0]) | ||
| } | ||
|
|
||
| matchLabels, err := cmd.Flags().GetStringSlice("match-labels") | ||
| if err != nil { | ||
| return fmt.Errorf("error reading label selection: %s", err) | ||
| } | ||
|
|
||
| inverse, err := cmd.Flags().GetBool("inverse") | ||
| if err != nil { | ||
| return fmt.Errorf("error reading inverse flag: %s", err) | ||
| } | ||
|
|
||
| dryRun, err := cmd.Flags().GetBool("dry-run") | ||
| if err != nil { | ||
| return fmt.Errorf("error reading dry-run flag: %s", err) | ||
| } | ||
|
|
||
| if len(queues) == 0 && len(matchLabels) == 0 { | ||
| return fmt.Errorf("either queue names or match-labels must be set to determine queues to cordon") | ||
| } else if len(queues) > 0 && len(matchLabels) > 0 { | ||
| return fmt.Errorf("you can cordon by either a set of queue names or a set of queue labels, but not both") | ||
| } | ||
|
|
||
| return a.CordonQueues(&armadactl.QueueQueryArgs{ | ||
| InQueueNames: queues, | ||
| ContainsAllLabels: matchLabels, | ||
| InvertResult: inverse, | ||
| OnlyCordoned: false, | ||
| }, dryRun) | ||
| }, | ||
| } | ||
| cmd.Flags().StringSliceP("match-labels", "l", []string{}, "Provide a comma separated list of labels. Queues matching all provided labels will have scheduling paused. Defaults to empty.") | ||
| cmd.Flags().Bool("inverse", false, "Select all queues which do not match the provided parameters") | ||
| cmd.Flags().Bool("dry-run", false, "Show selection of queues that will be modified in this operation") | ||
|
|
||
| return cmd | ||
| } | ||
|
|
||
| func uncordonQueues(a *armadactl.App) *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "queues <queue_1> <queue_2> <queue_3> ...", | ||
| Aliases: []string{"queue"}, | ||
| Short: "Resume scheduling for select queues", | ||
| Long: "Resume scheduling for select queues. This can be achieved either by queue names or by labels.", | ||
| PreRunE: func(cmd *cobra.Command, args []string) error { | ||
| return initParams(cmd, a.Params) | ||
| }, | ||
| RunE: func(cmd *cobra.Command, queues []string) error { | ||
| errs := slices.Filter(slices.Map(queues, queueNameValidation), func(err error) bool { return err != nil }) | ||
| if len(errs) > 0 { | ||
| return fmt.Errorf("provided queue name invalid: %s", errs[0]) | ||
| } | ||
|
|
||
| matchLabels, err := cmd.Flags().GetStringSlice("match-labels") | ||
| if err != nil { | ||
| return fmt.Errorf("error reading label selection: %s", err) | ||
| } | ||
|
|
||
| inverse, err := cmd.Flags().GetBool("inverse") | ||
| if err != nil { | ||
| return fmt.Errorf("error reading inverse flag: %s", err) | ||
| } | ||
|
|
||
| dryRun, err := cmd.Flags().GetBool("dry-run") | ||
| if err != nil { | ||
| return fmt.Errorf("error reading dry-run flag: %s", err) | ||
| } | ||
|
|
||
| if len(queues) == 0 && len(matchLabels) == 0 { | ||
| return fmt.Errorf("either queue names or match-labels must be set to determine queues to uncordon") | ||
| } else if len(queues) > 0 && len(matchLabels) > 0 { | ||
| return fmt.Errorf("you can uncordon by either a set of queue names or a set of queue labels, but not both") | ||
| } | ||
|
|
||
| return a.UncordonQueues(&armadactl.QueueQueryArgs{ | ||
| InQueueNames: queues, | ||
| ContainsAllLabels: matchLabels, | ||
| InvertResult: inverse, | ||
| OnlyCordoned: false, | ||
| }, dryRun) | ||
| }, | ||
| } | ||
| cmd.Flags().StringSliceP("match-labels", "l", []string{}, "Provide a comma separated list of labels. Queues matching all provided labels will have scheduling resumed. Defaults to empty.") | ||
| cmd.Flags().Bool("inverse", false, "Select all queues which do not match the provided parameters") | ||
| cmd.Flags().Bool("dry-run", false, "Show selection of queues that will be modified in this operation") | ||
|
|
||
| return cmd | ||
| } |
This file contains 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
This file contains 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
This file contains 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
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| package cmd | ||
|
|
||
| import "fmt" | ||
|
|
||
| func queueNameValidation(queueName string) error { | ||
| if queueName == "" { | ||
| return fmt.Errorf("cannot provide empty queue name") | ||
| } | ||
| return nil | ||
| } |
This file contains 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
Oops, something went wrong.