flux-resource: add -q, --queue=QUEUE option
#5935
Merged
Conversation
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
chu11
reviewed
May 3, 2024
| @@ -0,0 +1 @@ | |||
| 101 Nodes, 404 Cores, 0 GPUs | |||
t/t2350-resource-list.t
Outdated
Comment on lines
120
to
151
| test_expect_success 'flux-resource list supports -q, --queue' ' | ||
| flux resource list --queue=debug \ | ||
| --from-stdin --config-file=$FLUKE_CONFIG \ | ||
| < $FLUKE_INPUT > fluke-debug.output && | ||
| test_debug "cat fluke-debug.output" && | ||
| test_must_fail grep batch fluke-debug.output && | ||
| flux resource list --queue=batch \ | ||
| --from-stdin --config-file=$FLUKE_CONFIG \ | ||
| < $FLUKE_INPUT > fluke-batch.output && | ||
| test_debug "cat fluke-batch.output" && | ||
| test_must_fail grep debug fluke-batch.output && | ||
| flux resource list --queue=debug,batch \ | ||
| --from-stdin --config-file=$FLUKE_CONFIG \ | ||
| < $FLUKE_INPUT > fluke-both.output && | ||
| grep debug fluke-both.output && | ||
| grep batch fluke-both.output | ||
| ' | ||
| test_expect_success 'flux-resource list supports -q, --queue' ' | ||
| flux resource list --queue=debug \ | ||
| --from-stdin --config-file=$FLUKE_CONFIG \ | ||
| < $FLUKE_INPUT > fluke-debug.output && | ||
| test_debug "cat fluke-debug.output" && | ||
| test_must_fail grep batch fluke-debug.output && | ||
| flux resource list --queue=batch \ | ||
| --from-stdin --config-file=$FLUKE_CONFIG \ | ||
| < $FLUKE_INPUT > fluke-batch.output && | ||
| test_debug "cat fluke-batch.output" && | ||
| test_must_fail grep debug fluke-batch.output && | ||
| flux resource list --queue=debug,batch \ | ||
| --from-stdin --config-file=$FLUKE_CONFIG \ | ||
| < $FLUKE_INPUT > fluke-both.output && | ||
| grep debug fluke-both.output && | ||
| grep batch fluke-both.output | ||
| ' |
There was a problem hiding this comment.
duplicated test? or am i not seeing the difference?
There was a problem hiding this comment.
oh, cut and paste and intended to test flux resource R? i think a flux resource R test is missing
There was a problem hiding this comment.
Oh yeah, good catch. I think it is just a duplicate because flux resource R uses the same code as flux resource list, but might as well add similar tests for flux resource R here just using grep.
There was a problem hiding this comment.
Fixed that and force-pushed
Problem: flux-resource(1) subcommands don't support filtering output by queue. Add a -q, --queue=QUEUE option to most subcommands to allow filtering resources to one or more queues.
Problem: When using --from-stdin in tests there is no way to provide a corresponding Flux config for determining queues. Add a hidden --config-file=PATH option which can be used to provide a config object for testing.
Problem: There are no tests of flux-resource(1) -q, --queue option
handling.
Add some sample resource.sched-status and resource.status
payloads derived from the fluke test system to
t/flux-resource/{status,list}. Also add a flux.config input file
capturing the queues configuration.
Use these new input files to test `-q, --queues` handling for the
flux-resource(1) subcommands: list, info, R, and status.
Problem: The -q, --queue=QUEUE option is not documented in flux-resource(1). Document the option.
Problem: The bash completions file distributed with flux does not complete the -q, --queue option in flux-resource(1) commands. Add this option to the completions.
|
Thanks! Setting MWP. |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #5935 +/- ##
==========================================
+ Coverage 83.34% 83.36% +0.01%
==========================================
Files 514 514
Lines 83053 83104 +51
==========================================
+ Hits 69218 69276 +58
+ Misses 13835 13828 -7
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR adds a
-q, --queue=QUEUEoption toflux resourcesubcommandslist,status,info, andR.