Skip to content

Commit a025bcb

Browse files
milroymilroy
committed
testsuite: update existing tests, add checks for update under rv1exec
Problem: the current tests for reloading Fluxion with rv1exec fail due to lack of update support. Now that the support is added, we need tests for correct behavior. Add new tests to check for ability to reload Fluxion and update a resource graph with rv1exec. Update existing tests to use the additional option required by resource-query for update.
1 parent ab645ac commit a025bcb

File tree

6 files changed

+154
-60
lines changed

6 files changed

+154
-60
lines changed

‎t/data/resource/jobspecs/update/test007.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
version: 9999
2+
resources:
3+
- type: node
4+
count: 1
5+
with:
6+
- type: slot
7+
count: 1
8+
label: default
9+
with:
10+
- type: core
11+
count: 1
12+
# a comment
13+
attributes:
14+
system:
15+
duration: 3600
16+
tasks:
17+
- command: [ "app" ]
18+
slot: default
19+
count:
20+
per_slot: 1
21+

‎t/data/resource/jobspecs/update/test008.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
version: 9999
2+
resources:
3+
- type: node
4+
count: 1
5+
with:
6+
- type: slot
7+
count: 1
8+
label: default
9+
with:
10+
- type: core
11+
count: 1
12+
- type: gpu
13+
count: 1
14+
# a comment
15+
attributes:
16+
system:
17+
duration: 3600
18+
tasks:
19+
- command: [ "app" ]
20+
slot: default
21+
count:
22+
per_slot: 1
23+

‎t/data/resource/rv1exec/tiny_rv1exec.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"version": 1, "execution": {"R_lite": [{"rank": "0-1", "children": {"core": "0-15", "gpu": "0-3"}}], "nodelist": ["node[0-1]"], "starttime": 0, "expiration": 1000000}}

‎t/t1007-recovery-full.t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ test_expect_success 'recovery: a cancel leads to a job schedule (rv1_nosched)' '
146146
'
147147

148148
# flux-framework/flux-sched#991
149-
test_expect_failure 'recovery: both modules restart (rv1_nosched->rv1_nosched)' '
149+
test_expect_success 'recovery: both modules restart (rv1_nosched->rv1_nosched)' '
150150
reload_resource match-format=rv1_nosched policy=high &&
151151
reload_qmanager &&
152152
flux module stats sched-fluxion-qmanager &&

‎t/t3022-resource-update.t‎

Lines changed: 102 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@ unit_job="${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/update/test001.yaml"
88
job2="${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/update/test002.yaml"
99
job3="${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/update/test003.yaml"
1010
job4="${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/update/test004.yaml"
11+
job5="${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/update/test007.yaml"
12+
job5="${SHARNESS_TEST_SRCDIR}/data/resource/jobspecs/update/test008.yaml"
1113
grugs="${SHARNESS_TEST_SRCDIR}/data/resource/grugs/tiny.graphml"
14+
rv1exec_graph="${SHARNESS_TEST_SRCDIR}/data/resource/rv1exec/tiny_rv1exec.json"
1215
query="../../resource/utilities/resource-query"
1316

1417
test001_desc="match-allocate/update-allocate result in same output"
@@ -24,10 +27,10 @@ EOF
2427
cat 001.R.out | grep -v INFO | \
2528
split -l 1 --additional-suffix=".json" - cmds001_ &&
2629
cat >upd_cmds001 <<-EOF &&
27-
update allocate cmds001_aa.json 1 0 3600
28-
update allocate cmds001_ab.json 2 0 3600
29-
update allocate cmds001_ac.json 3 0 3600
30-
update allocate cmds001_ad.json 4 0 3600
30+
update allocate jgf cmds001_aa.json 1 0 3600
31+
update allocate jgf cmds001_ab.json 2 0 3600
32+
update allocate jgf cmds001_ac.json 3 0 3600
33+
update allocate jgf cmds001_ad.json 4 0 3600
3134
quit
3235
EOF
3336
${query} -L ${grugs} -S CA -P high -F jgf -t 001.R.out2 < upd_cmds001 &&
@@ -47,9 +50,9 @@ EOF
4750
cat 002.R.out | grep -v INFO | \
4851
split -l 1 --additional-suffix=".json" - cmds002_ &&
4952
cat >upd_cmds002 <<-EOF &&
50-
update allocate cmds002_aa.json 1 0 3600
53+
update allocate jgf cmds002_aa.json 1 0 3600
5154
match allocate ${unit_job}
52-
update allocate cmds002_ac.json 3 0 3600
55+
update allocate jgf cmds002_ac.json 3 0 3600
5356
match allocate ${unit_job}
5457
quit
5558
EOF
@@ -76,16 +79,16 @@ EOF
7679
cat 003.R.out | grep -v INFO | \
7780
split -l 1 --additional-suffix=".json" - cmds003_ &&
7881
cat >upd_cmds003 <<-EOF &&
79-
update allocate cmds003_aa.json 1 0 3600
80-
update allocate cmds003_ab.json 2 0 3600
81-
update allocate cmds003_ac.json 3 0 3600
82-
update allocate cmds003_ad.json 4 0 3600
83-
update reserve cmds003_ae.json 5 3600 3600
84-
update reserve cmds003_af.json 6 3600 3600
85-
update reserve cmds003_ag.json 7 3600 3600
86-
update reserve cmds003_ah.json 8 3600 3600
87-
update reserve cmds003_ai.json 9 7200 3600
88-
update reserve cmds003_aj.json 10 7200 3600
82+
update allocate jgf cmds003_aa.json 1 0 3600
83+
update allocate jgf cmds003_ab.json 2 0 3600
84+
update allocate jgf cmds003_ac.json 3 0 3600
85+
update allocate jgf cmds003_ad.json 4 0 3600
86+
update reserve jgf cmds003_ae.json 5 3600 3600
87+
update reserve jgf cmds003_af.json 6 3600 3600
88+
update reserve jgf cmds003_ag.json 7 3600 3600
89+
update reserve jgf cmds003_ah.json 8 3600 3600
90+
update reserve jgf cmds003_ai.json 9 7200 3600
91+
update reserve jgf cmds003_aj.json 10 7200 3600
8992
quit
9093
EOF
9194
${query} -L ${grugs} -S CA -P high -F jgf -t 003.R.out2 < upd_cmds003 &&
@@ -111,16 +114,16 @@ EOF
111114
cat 004.R.out | grep -v INFO | \
112115
split -l 1 --additional-suffix=".json" - cmds004_ &&
113116
cat >upd_cmds004 <<-EOF &&
114-
update allocate cmds004_aa.json 1 0 3600
115-
update allocate cmds004_ab.json 2 0 3600
116-
update allocate cmds004_ac.json 3 0 3600
117+
update allocate jgf cmds004_aa.json 1 0 3600
118+
update allocate jgf cmds004_ab.json 2 0 3600
119+
update allocate jgf cmds004_ac.json 3 0 3600
117120
match allocate_orelse_reserve ${unit_job}
118-
update reserve cmds004_ae.json 5 3600 3600
119-
update reserve cmds004_af.json 6 3600 3600
121+
update reserve jgf cmds004_ae.json 5 3600 3600
122+
update reserve jgf cmds004_af.json 6 3600 3600
120123
match allocate_orelse_reserve ${unit_job}
121-
update reserve cmds004_ah.json 8 3600 3600
124+
update reserve jgf cmds004_ah.json 8 3600 3600
122125
match allocate_orelse_reserve ${unit_job}
123-
update reserve cmds004_aj.json 10 7200 3600
126+
update reserve jgf cmds004_aj.json 10 7200 3600
124127
quit
125128
EOF
126129
${query} -L ${grugs} -S CA -P high -F jgf -t 004.R.out2 < upd_cmds004 &&
@@ -148,18 +151,18 @@ EOF
148151
cat 005.R.out | grep -v INFO | \
149152
split -l 1 --additional-suffix=".json" - cmds005_ &&
150153
cat >upd_cmds005 <<-EOF &&
151-
update allocate cmds005_aa.json 1 0 3600
152-
update allocate cmds005_ab.json 2 0 3600
153-
update allocate cmds005_ac.json 3 0 3600
154-
update allocate cmds005_ad.json 4 0 3600
155-
update reserve cmds005_ae.json 5 3600 3600
154+
update allocate jgf cmds005_aa.json 1 0 3600
155+
update allocate jgf cmds005_ab.json 2 0 3600
156+
update allocate jgf cmds005_ac.json 3 0 3600
157+
update allocate jgf cmds005_ad.json 4 0 3600
158+
update reserve jgf cmds005_ae.json 5 3600 3600
156159
cancel 4
157-
update reserve cmds005_af.json 6 0 3600
158-
update reserve cmds005_ag.json 7 3600 3600
159-
update reserve cmds005_ah.json 8 3600 3600
160+
update reserve jgf cmds005_af.json 6 0 3600
161+
update reserve jgf cmds005_ag.json 7 3600 3600
162+
update reserve jgf cmds005_ah.json 8 3600 3600
160163
cancel 6
161-
update reserve cmds005_ai.json 9 0 3600
162-
update reserve cmds005_aj.json 10 3600 3600
164+
update reserve jgf cmds005_ai.json 9 0 3600
165+
update reserve jgf cmds005_aj.json 10 3600 3600
163166
quit
164167
EOF
165168
${query} -L ${grugs} -S CA -P high -F jgf -t 005.R.out2 < upd_cmds005 &&
@@ -187,10 +190,10 @@ split -l 1 --additional-suffix=".json" - cmds006_ &&
187190
match allocate ${unit_job}
188191
match allocate ${unit_job}
189192
match allocate ${unit_job}
190-
update allocate cmds006_aa.json 1 0 3600
191-
update allocate cmds006_ab.json 2 0 3600
192-
update allocate cmds006_ac.json 3 0 3600
193-
update allocate cmds006_ad.json 4 0 3600
193+
update allocate jgf cmds006_aa.json 1 0 3600
194+
update allocate jgf cmds006_ab.json 2 0 3600
195+
update allocate jgf cmds006_ac.json 3 0 3600
196+
update allocate jgf cmds006_ad.json 4 0 3600
194197
cancel 1
195198
cancel 3
196199
match allocate ${unit_job}
@@ -218,10 +221,10 @@ split -l 1 --additional-suffix=".json" - cmds007_ &&
218221
match allocate ${unit_job}
219222
match allocate ${unit_job}
220223
match allocate ${unit_job}
221-
update allocate cmds007_aa.json 5 0 3600
222-
update allocate cmds007_ab.json 6 0 3600
223-
update allocate cmds007_ac.json 7 0 3600
224-
update allocate cmds007_ad.json 8 0 3600
224+
update allocate jgf cmds007_aa.json 5 0 3600
225+
update allocate jgf cmds007_ab.json 6 0 3600
226+
update allocate jgf cmds007_ac.json 7 0 3600
227+
update allocate jgf cmds007_ad.json 8 0 3600
225228
quit
226229
EOF
227230
${query} -L ${grugs} -S CA -P high -F jgf -t 007.R.out2 < upd_cmds007 &&
@@ -251,7 +254,7 @@ EOF
251254
split -l 1 --additional-suffix=".json" - cmds008_ &&
252255
cat >upd_cmds008 <<-EOF &&
253256
match allocate ${unit_job}
254-
update allocate cmds008_aa.json 2 0 3600
257+
update allocate jgf cmds008_aa.json 2 0 3600
255258
match allocate ${unit_job}
256259
match allocate ${unit_job}
257260
match allocate ${unit_job}
@@ -262,7 +265,7 @@ EOF
262265
cat 008.R.out2 | grep -v INFO > 008.R.out2.filtered &&
263266
test_cmp 008.R.out2.filtered 008.R.out.filtered &&
264267
cat >upd_cmds008.2 <<-EOF &&
265-
update allocate cmds008_aa.json 1 0 3600
268+
update allocate jgf cmds008_aa.json 1 0 3600
266269
match allocate ${unit_job}
267270
match allocate ${unit_job}
268271
quit
@@ -296,10 +299,10 @@ EOF
296299
${query} -L ${grugs} -S CA -P high -F jgf -t 009.2.R.out < cmds009.2 &&
297300
cat >upd_cmds009 <<-EOF &&
298301
match allocate ${job3}
299-
update allocate cmds009_aa.json 2 0 3600
300-
update allocate cmds009_ab.json 3 0 3600
301-
update allocate cmds009_ac.json 4 0 3600
302-
update allocate cmds009_ad.json 5 0 3600
302+
update allocate jgf cmds009_aa.json 2 0 3600
303+
update allocate jgf cmds009_ab.json 3 0 3600
304+
update allocate jgf cmds009_ac.json 4 0 3600
305+
update allocate jgf cmds009_ad.json 5 0 3600
303306
quit
304307
EOF
305308
${query} -L ${grugs} -S CA -P high -F jgf -t 009.R.out2 < upd_cmds009 &&
@@ -319,8 +322,8 @@ EOF
319322
cat 010.R.out | grep -v INFO | \
320323
split -l 1 --additional-suffix=".json" - cmds010_ &&
321324
cat >upd_cmds010 <<-EOF &&
322-
update allocate cmds010_aa.json 1 0 3600
323-
update allocate cmds010_ab.json 2 0 3600
325+
update allocate jgf cmds010_aa.json 1 0 3600
326+
update allocate jgf cmds010_ab.json 2 0 3600
324327
quit
325328
EOF
326329
${query} -L ${grugs} -S CA -P high -F jgf -t 010.R.out2 < upd_cmds010 &&
@@ -340,15 +343,61 @@ EOF
340343
cat 011.R.out | grep -v INFO | \
341344
split -l 1 --additional-suffix=".json" - cmds011_ &&
342345
cat >upd_cmds011 <<-EOF &&
343-
update allocate cmds001_aa.json 1 0 3600
344-
update allocate cmds001_ab.json 2 0 3600
345-
update allocate cmds001_ac.json 3 0 3600
346-
update allocate cmds001_ad.json 4 0 3600
346+
update allocate jgf cmds001_aa.json 1 0 3600
347+
update allocate jgf cmds001_ab.json 2 0 3600
348+
update allocate jgf cmds001_ac.json 3 0 3600
349+
update allocate jgf cmds001_ad.json 4 0 3600
347350
quit
348351
EOF
349352
${query} -L ${grugs} -S CA -P high -F rv1 -t 011.R.out2 < upd_cmds011 &&
350353
test_cmp 011.R.out2 011.R.out
351354
'
352355

356+
test012_desc="match-allocate/update-allocate result in same output for rv1exec"
357+
test_expect_success "${test001_desc}" '
358+
cat >cmds012 <<-EOF &&
359+
match allocate ${job5}
360+
match allocate ${job5}
361+
match allocate ${job5}
362+
match allocate ${job5}
363+
quit
364+
EOF
365+
${query} -L ${rv1exec_graph} -f rv1exec -S CA -P high -F rv1_nosched -t 012.R.out < cmds012 &&
366+
cat 012.R.out | grep -v INFO | \
367+
split -l 1 --additional-suffix=".json" - cmds012_ &&
368+
cat >upd_cmds012 <<-EOF &&
369+
update allocate rv1exec cmds012_aa.json 1 0 3600
370+
update allocate rv1exec cmds012_ab.json 2 0 3600
371+
update allocate rv1exec cmds012_ac.json 3 0 3600
372+
update allocate rv1exec cmds012_ad.json 4 0 3600
373+
quit
374+
EOF
375+
${query} -L ${rv1exec_graph} -f rv1exec -S CA -P high -F rv1_nosched -t 012.R.out2 < upd_cmds012 &&
376+
test_cmp 012.R.out2 012.R.out
377+
'
378+
379+
test013_desc="match-allocate/update-allocate result in same output for rv1exec with gpus"
380+
test_expect_success "${test001_desc}" '
381+
cat >cmds013 <<-EOF &&
382+
match allocate ${job6}
383+
match allocate ${job6}
384+
match allocate ${job6}
385+
match allocate ${job6}
386+
quit
387+
EOF
388+
${query} -L ${rv1exec_graph} -f rv1exec -S CA -P high -F rv1_nosched -t 013.R.out < cmds013 &&
389+
cat 013.R.out | grep -v INFO | \
390+
split -l 1 --additional-suffix=".json" - cmds013_ &&
391+
cat >upd_cmds013 <<-EOF &&
392+
update allocate rv1exec cmds013_aa.json 1 0 3600
393+
update allocate rv1exec cmds013_ab.json 2 0 3600
394+
update allocate rv1exec cmds013_ac.json 3 0 3600
395+
update allocate rv1exec cmds013_ad.json 4 0 3600
396+
quit
397+
EOF
398+
${query} -L ${rv1exec_graph} -f rv1exec -S CA -P high -F rv1_nosched -t 013.R.out2 < upd_cmds013 &&
399+
test_cmp 013.R.out2 013.R.out
400+
'
401+
353402
test_done
354403

‎t/t3023-resource-update2.t‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ EOF
2222
cat 001.R.out | grep -v INFO | \
2323
split -l 1 --additional-suffix=".json" - cmds001_ &&
2424
cat >upd_cmds001 <<-EOF &&
25-
update allocate cmds001_aa.json 1 0 3600
26-
update allocate cmds001_ab.json 2 0 3600
25+
update allocate jgf cmds001_aa.json 1 0 3600
26+
update allocate jgf cmds001_ab.json 2 0 3600
2727
quit
2828
EOF
2929
${query} -L ${grugs} -S CA -P high -F jgf -t 001.R.out2 < upd_cmds001 &&
@@ -41,8 +41,8 @@ EOF
4141
cat 002.R.out | grep -v INFO | \
4242
split -l 1 --additional-suffix=".json" - cmds002_ &&
4343
cat >upd_cmds002 <<-EOF &&
44-
update allocate cmds002_aa.json 1 0 3600
45-
update allocate cmds002_ab.json 2 0 3600
44+
update allocate jgf cmds002_aa.json 1 0 3600
45+
update allocate jgf cmds002_ab.json 2 0 3600
4646
quit
4747
EOF
4848
${query} -L ${grugs} -S PA -P high -F jgf -t 002.R.out2 < upd_cmds002 &&
@@ -60,7 +60,7 @@ EOF
6060
cat 003.R.out | grep -v INFO | \
6161
split -l 1 --additional-suffix=".json" - cmds003_ &&
6262
cat >upd_cmds003 <<-EOF &&
63-
update allocate cmds003_aa.json 1 0 3600
63+
update allocate jgf cmds003_aa.json 1 0 3600
6464
match allocate ${job5}
6565
match allocate ${job5}
6666
quit
@@ -80,7 +80,7 @@ EOF
8080
cat 004.R.out | grep -v INFO | \
8181
split -l 1 --additional-suffix=".json" - cmds004_ &&
8282
cat >upd_cmds004 <<-EOF &&
83-
update allocate cmds004_aa.json 1 0 3600
83+
update allocate jgf cmds004_aa.json 1 0 3600
8484
match allocate ${job5}
8585
match allocate ${job5}
8686
cancel 1

0 commit comments

Comments
 (0)