Skip to content

Commit

Permalink
testsuite: add partial release tests with ssd pruning filters
Browse files Browse the repository at this point in the history
Problem: the current tests for
#1284 do not check
to ensure partial cancel behaves as desires with ssd pruning filters.

Add the tests with the ssd pruning filters at all ancestor graph
vertices.
  • Loading branch information
milroy committed Oct 31, 2024
1 parent 68c539f commit 0b16501
Showing 1 changed file with 89 additions and 0 deletions.
89 changes: 89 additions & 0 deletions t/t1027-rv1-partial-release-brokerless-resources.t
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ EOF
flux module load resource monitor-force-up &&
flux module load sched-fluxion-resource &&
flux module load sched-fluxion-qmanager &&
flux module unload job-list &&
flux module list &&
flux queue start --all --quiet &&
flux resource list &&
Expand Down Expand Up @@ -101,4 +102,92 @@ test_expect_success 'reload fluxion and resource module' '
flux module remove sched-fluxion-resource
'

test_expect_success 're-run tests with ssd pruning filters' '
flux module remove resource &&
flux config load <<EOF &&
[resource]
noverify = true
norestrict = true
path="${SHARNESS_TEST_SRCDIR}/data/resource/jgfs/issue1284.json"
[sched-fluxion-resource]
prune-filters = "ALL:core,ALL:ssd"
EOF
flux module load resource monitor-force-up &&
flux module load sched-fluxion-resource &&
flux module load sched-fluxion-qmanager &&
flux module list &&
flux queue start --all --quiet &&
flux resource list &&
flux resource status &&
jobid=$(flux job submit --flags=waitable \
${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/issues/issue1284.json) &&
flux job wait-event -vt5 ${jobid} alloc &&
flux job wait-event -vt5 ${jobid} clean
'

test_expect_success 'single-node non-ssd jobspecs can be allocated with ssd pruning filters' '
jobid=$(flux submit -n1 -N1 true) &&
flux job wait-event -vt5 ${jobid} alloc &&
flux job wait-event -vt5 ${jobid} clean
'

test_expect_success 'a second ssd jobspec can be allocated with ssd pruning filters' '
jobid=$(flux job submit --flags=waitable \
${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/issues/issue1284.json) &&
flux job wait-event -vt15 ${jobid} alloc &&
flux job wait-event -vt5 ${jobid} clean
'

test_expect_success 'single-node non-ssd jobspecs can still be allocated with ssd pruning filters' '
(flux cancel ${jobid} || true) &&
jobid=$(flux submit -n1 -N1 true) &&
flux job wait-event -vt5 ${jobid} alloc &&
flux job wait-event -vt5 ${jobid} clean
'

test_expect_success 'reload fluxion and resource module with ssd pruning filters' '
flux cancel --all &&
flux module remove sched-fluxion-qmanager &&
flux module remove sched-fluxion-resource &&
flux module reload resource &&
flux module load sched-fluxion-resource &&
flux module load sched-fluxion-qmanager &&
flux module list &&
flux queue start --all --quiet
'

test_expect_success 'an ssd jobspec with no slot can be allocated with ssd pruning filters' '
flux resource list &&
flux resource status &&
jobid=$(flux job submit --flags=waitable \
${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/issues/issue1284-noslot.json) &&
flux job wait-event -vt5 ${jobid} alloc &&
flux job wait-event -vt5 ${jobid} clean
'

test_expect_success 'single-node non-ssd jobspecs can be allocated with ssd pruning filters' '
jobid=$(flux submit -n1 -N1 true) &&
flux job wait-event -vt5 ${jobid} alloc &&
flux job wait-event -vt5 ${jobid} clean
'

test_expect_success 'a second ssd jobspec with no slot can be allocated with ssd pruning filters' '
jobid=$(flux job submit --flags=waitable \
${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/issues/issue1284-noslot.json) &&
flux job wait-event -vt15 ${jobid} alloc &&
flux job wait-event -vt5 ${jobid} clean
'

test_expect_success 'single-node non-ssd jobspecs can still be allocated with ssd pruning filters' '
(flux cancel ${jobid} || true) &&
jobid=$(flux submit -n1 -N1 true) &&
flux job wait-event -vt5 ${jobid} alloc &&
flux job wait-event -vt5 ${jobid} clean
'

test_expect_success 'reload fluxion and resource module with ssd pruning filters' '
flux module remove sched-fluxion-qmanager &&
flux module remove sched-fluxion-resource
'

test_done

0 comments on commit 0b16501

Please sign in to comment.