Skip to content

Commit 68c636a

Browse files
mergify[bot]mergify[bot]
authored
Merge pull request #1157 from jameshcorbett/flux-job-cancel-deprecated
Replace deprecated 'flux job cancel[all]' usage
2 parents 5c33a4e + 7b6167a commit 68c636a

17 files changed

+70
-70
lines changed

‎t/sharness.d/sched-sharness.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ load_test_resources () {
9494
# N.B. this assumes that a scheduler is loaded
9595
cleanup_active_jobs () {
9696
flux queue stop --all &&
97-
flux job cancelall -f &&
97+
flux cancel --all &&
9898
flux queue idle
9999
}
100100

‎t/t1001-qmanager-basic.t‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ test_expect_success 'qmanager: canceling job during execution works' '
4747
jobid=$(flux run --dry-run -t 100m hostname | \
4848
exec_test | flux job submit) &&
4949
flux job wait-event -vt 10 ${jobid} start &&
50-
flux job cancel ${jobid} &&
50+
flux cancel ${jobid} &&
5151
flux job wait-event -t 10 ${jobid} exception &&
5252
flux job wait-event -t 10 ${jobid} finish | grep status=15 &&
5353
flux job wait-event -t 10 ${jobid} release &&

‎t/t1002-qmanager-reload.t‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ test_expect_success 'qmanager: handle the alloc resubmitted by job-manager' '
5757
jobid1=$(cat jobid1.out) &&
5858
jobid2=$(cat jobid2.out) &&
5959
jobid3=$(cat jobid3.out) &&
60-
flux job cancel ${jobid1} &&
60+
flux cancel ${jobid1} &&
6161
flux job wait-event -t 10 ${jobid2} start
6262
'
6363

6464
test_expect_success 'qmanager: canceling a pending job works' '
6565
jobid3=$(cat jobid3.out) &&
66-
flux job cancel ${jobid3} &&
66+
flux cancel ${jobid3} &&
6767
flux job wait-event -t 10 ${jobid3} exception
6868
'
6969

‎t/t1003-qmanager-policy.t‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ test_expect_success 'qmanager: EASY policy correctly schedules jobs' '
5454
flux job wait-event -t 10 ${jobid1} start &&
5555
flux job wait-event -t 10 ${jobid6} start &&
5656
flux job wait-event -t 10 ${jobid11} start &&
57-
flux job cancel ${jobid6} &&
57+
flux cancel ${jobid6} &&
5858
flux job wait-event -t 10 ${jobid7} start &&
5959
flux job wait-event -t 10 ${jobid9} start &&
6060
test $(flux job list --states=active | wc -l) -eq 10 &&
6161
test $(flux job list --states=running| wc -l) -eq 4 &&
6262
active_jobs=$(flux job list --states=active | jq .id) &&
63-
for job in ${active_jobs}; do flux job cancel ${job}; done &&
63+
for job in ${active_jobs}; do flux cancel ${job}; done &&
6464
for job in ${active_jobs}; do flux job wait-event -t 10 ${job} clean; done
6565
'
6666

@@ -86,12 +86,12 @@ test_expect_success 'qmanager: HYBRID policy correctly schedules jobs' '
8686
flux job wait-event -t 10 ${jobid1} start &&
8787
flux job wait-event -t 10 ${jobid7} start &&
8888
flux job wait-event -t 10 ${jobid11} start &&
89-
flux job cancel ${jobid7} &&
89+
flux cancel ${jobid7} &&
9090
flux job wait-event -t 10 ${jobid9} start &&
9191
test $(flux job list --states=active | wc -l) -eq 10 &&
9292
test $(flux job list --states=running| wc -l) -eq 3 &&
9393
active_jobs=$(flux job list --states=active | jq .id) &&
94-
for job in ${active_jobs}; do flux job cancel ${job}; done &&
94+
for job in ${active_jobs}; do flux cancel ${job}; done &&
9595
for job in ${active_jobs}; do flux job wait-event -t 10 ${job} clean; done
9696
'
9797

@@ -118,12 +118,12 @@ test_expect_success 'qmanager: CONSERVATIVE correctly schedules jobs' '
118118
flux job wait-event -t 10 ${jobid1} start &&
119119
flux job wait-event -t 10 ${jobid7} start &&
120120
flux job wait-event -t 10 ${jobid11} start &&
121-
flux job cancel ${jobid7} &&
121+
flux cancel ${jobid7} &&
122122
flux job wait-event -t 10 ${jobid7} clean &&
123123
test $(flux job list --states=active | wc -l) -eq 10 &&
124124
test $(flux job list --states=running| wc -l) -eq 2 &&
125125
active_jobs=$(flux job list --states=active | jq .id) &&
126-
for job in ${active_jobs}; do flux job cancel ${job}; done &&
126+
for job in ${active_jobs}; do flux cancel ${job}; done &&
127127
for job in ${active_jobs}; do flux job wait-event -t 10 ${job} clean; done
128128
'
129129

‎t/t1004-qmanager-optimize.t‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ test_expect_success 'qmanager: EASY policy conforms to queue-depth=5' '
5353
5454
flux job wait-event -t 10 ${jobid1} start &&
5555
flux job wait-event -t 10 ${jobid6} start &&
56-
flux job cancel ${jobid6} &&
56+
flux cancel ${jobid6} &&
5757
flux job wait-event -t 10 ${jobid7} start &&
58-
flux job cancel ${jobid7} &&
58+
flux cancel ${jobid7} &&
5959
flux job wait-event -t 10 ${jobid8} start &&
6060
test $(flux job list --states=active | wc -l) -eq 9 &&
6161
test $(flux job list --states=running | wc -l) -eq 2 &&
6262
active_jobs=$(flux job list --states=active | jq .id) &&
63-
for job in ${active_jobs}; do flux job cancel ${job}; done &&
63+
for job in ${active_jobs}; do flux cancel ${job}; done &&
6464
for job in ${active_jobs}; do flux job wait-event -t 10 ${job} clean; done
6565
'
6666

@@ -88,7 +88,7 @@ test_expect_success 'qmanager: HYBRID policy conforms to queue-depth=5' '
8888
test $(flux job list --states=active | wc -l) -eq 11 &&
8989
test $(flux job list --states=running| wc -l) -eq 1 &&
9090
active_jobs=$(flux job list --states=active | jq .id) &&
91-
for job in ${active_jobs}; do flux job cancel ${job}; done &&
91+
for job in ${active_jobs}; do flux cancel ${job}; done &&
9292
for job in ${active_jobs}; do flux job wait-event -t 10 ${job} clean; done
9393
'
9494

@@ -115,7 +115,7 @@ test_expect_success 'qmanager: CONSERVATIVE policy conforms to queue-depth=5' '
115115
test $(flux job list --states=active | wc -l) -eq 11 &&
116116
test $(flux job list --states=running | wc -l) -eq 1 &&
117117
active_jobs=$(flux job list --states=active | jq .id) &&
118-
for job in ${active_jobs}; do flux job cancel ${job}; done &&
118+
for job in ${active_jobs}; do flux cancel ${job}; done &&
119119
for job in ${active_jobs}; do flux job wait-event -t 10 ${job} clean; done
120120
'
121121

‎t/t1007-recovery-full.t‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ test_expect_success 'recovery: submit to occupy resources fully (rv1)' '
4848
test_expect_success 'recovery: cancel one running job without fluxion' '
4949
remove_qmanager &&
5050
remove_resource &&
51-
flux job cancel ${jobid1} &&
51+
flux cancel ${jobid1} &&
5252
flux job wait-event -t 10 ${jobid1} release
5353
'
5454

@@ -64,7 +64,7 @@ test_expect_success 'recovery: works when both modules restart (rv1)' '
6464
'
6565

6666
test_expect_success 'recovery: a cancel leads to a job schedule (rv1)' '
67-
flux job cancel ${jobid2} &&
67+
flux cancel ${jobid2} &&
6868
flux job wait-event -t 10 ${jobid6} start
6969
'
7070

@@ -80,7 +80,7 @@ test_expect_success 'recovery: works when only qmanager restarts (rv1)' '
8080
'
8181

8282
test_expect_success 'recovery: a cancel leads to a job schedule (rv1)' '
83-
flux job cancel ${jobid3} &&
83+
flux cancel ${jobid3} &&
8484
flux job wait-event -t 10 ${jobid3} clean &&
8585
flux job wait-event -t 10 ${jobid7} start
8686
'
@@ -104,10 +104,10 @@ test_expect_success 'recovery: only qmanager restarts (rv1->rv1_nosched)' '
104104
'
105105

106106
test_expect_success 'recovery: cancel all jobs (rv1_nosched)' '
107-
flux job cancel ${jobid4} &&
108-
flux job cancel ${jobid5} &&
109-
flux job cancel ${jobid6} &&
110-
flux job cancel ${jobid7} &&
107+
flux cancel ${jobid4} &&
108+
flux cancel ${jobid5} &&
109+
flux cancel ${jobid6} &&
110+
flux cancel ${jobid7} &&
111111
flux job wait-event -t 10 ${jobid4} clean &&
112112
flux job wait-event -t 10 ${jobid5} clean &&
113113
flux job wait-event -t 10 ${jobid6} clean &&
@@ -141,7 +141,7 @@ test_expect_success 'recovery: qmanager restarts (rv1_nosched->rv1_nosched)' '
141141
'
142142

143143
test_expect_success 'recovery: a cancel leads to a job schedule (rv1_nosched)' '
144-
flux job cancel ${jobid1} &&
144+
flux cancel ${jobid1} &&
145145
flux job wait-event -t 60 ${jobid5} start
146146
'
147147

‎t/t1009-recovery-multiqueue.t‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ test_expect_success 'recovery: works when both modules restart (rv1)' '
7777
'
7878

7979
test_expect_success 'recovery: a cancel leads to a job schedule (rv1)' '
80-
flux job cancel ${jobid2} &&
80+
flux cancel ${jobid2} &&
8181
flux job wait-event -t 10 ${jobid4} start
8282
'
8383

8484
test_expect_success 'recovery: cancel all jobs (rv1_nosched)' '
85-
flux job cancel ${jobid1} &&
86-
flux job cancel ${jobid3} &&
87-
flux job cancel ${jobid4} &&
85+
flux cancel ${jobid1} &&
86+
flux cancel ${jobid3} &&
87+
flux cancel ${jobid4} &&
8888
flux job wait-event -t 10 ${jobid4} release
8989
'
9090

‎t/t1011-dynstate-change.t‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ test_expect_success 'dyn-state: node drain does not kill the job' '
5353
'
5454

5555
test_expect_success 'dyn-state: killing the job on the drained node works' '
56-
flux job cancel ${jobid1} &&
56+
flux cancel ${jobid1} &&
5757
flux job wait-event -t 10 ${jobid1} clean
5858
'
5959

@@ -72,17 +72,17 @@ test_expect_success 'dyn-state: the drained node with a job not used' '
7272
jobid4=$(flux job submit 1N.json) &&
7373
flux job wait-event -t 10 ${jobid4} start &&
7474
flux resource drain ${rank} &&
75-
flux job cancel ${jobid1} &&
75+
flux cancel ${jobid1} &&
7676
flux job wait-event -t 10 ${jobid1} clean &&
7777
jobid5=$(flux job submit 1N.json) &&
7878
test_must_fail flux job wait-event -t 1 ${jobid5} start
7979
'
8080

8181
test_expect_success 'dyn-state: cancel all jobs' '
82-
flux job cancel ${jobid2} &&
83-
flux job cancel ${jobid3} &&
84-
flux job cancel ${jobid4} &&
85-
flux job cancel ${jobid5} &&
82+
flux cancel ${jobid2} &&
83+
flux cancel ${jobid3} &&
84+
flux cancel ${jobid4} &&
85+
flux cancel ${jobid5} &&
8686
flux job wait-event -t 10 ${jobid2} clean &&
8787
flux job wait-event -t 10 ${jobid3} clean &&
8888
flux job wait-event -t 10 ${jobid4} clean &&
@@ -100,15 +100,15 @@ test_expect_success 'dyn-state: drain prevents a full job from running' '
100100
flux resource drain 0 &&
101101
jobid1=$(flux job submit basic.json) &&
102102
test_must_fail flux job wait-event -t 1 ${jobid1} start &&
103-
flux job cancel ${jobid1}
103+
flux cancel ${jobid1}
104104
'
105105

106106
test_expect_success 'dyn-state: a full job blocks a later job under fcfs' '
107107
jobid1=$(flux job submit basic.json) &&
108108
jobid2=$(flux job submit 1N.json) &&
109109
test_must_fail flux job wait-event -t 1 ${jobid2} start &&
110-
flux job cancel ${jobid1} &&
111-
flux job cancel ${jobid2}
110+
flux cancel ${jobid1} &&
111+
flux cancel ${jobid2}
112112
'
113113

114114
test_expect_success 'dyn-state: correct unsatifiability after drain' '
@@ -133,11 +133,11 @@ test_expect_success 'dyn-state: a full job skipped for a later job under easy' '
133133
jobid1=$(flux job submit basic.json) &&
134134
jobid2=$(flux job submit 1N.json) &&
135135
flux job wait-event -t 10 ${jobid2} start &&
136-
flux job cancel ${jobid2} &&
136+
flux cancel ${jobid2} &&
137137
flux job wait-event -t 10 ${jobid2} clean &&
138138
flux resource undrain 3 &&
139139
flux job wait-event -t 10 ${jobid1} start &&
140-
flux job cancel ${jobid1} &&
140+
flux cancel ${jobid1} &&
141141
flux job wait-event -t 10 ${jobid1} clean
142142
'
143143

@@ -171,17 +171,17 @@ test_expect_success 'dyn-state: a full job blocks a later job for fcfs queue' '
171171
jobid1=$(flux job submit basic.debug.json) &&
172172
jobid2=$(flux job submit 1N.debug.json) &&
173173
test_must_fail flux job wait-event -t 1 ${jobid1} start &&
174-
flux job cancel ${jobid1} &&
175-
flux job cancel ${jobid2} &&
174+
flux cancel ${jobid1} &&
175+
flux cancel ${jobid2} &&
176176
flux job wait-event -t 1 ${jobid2} clean
177177
'
178178

179179
test_expect_success 'dyn-state: a job skipped for a later job for easy queue' '
180180
jobid1=$(flux job submit basic.batch.json) &&
181181
jobid2=$(flux job submit 1N.batch.json) &&
182182
flux job wait-event -t 1 ${jobid2} start &&
183-
flux job cancel ${jobid1} &&
184-
flux job cancel ${jobid2} &&
183+
flux cancel ${jobid1} &&
184+
flux cancel ${jobid2} &&
185185
flux job wait-event -t 1 ${jobid2} clean
186186
'
187187

‎t/t1012-find-status.t‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ test_expect_success 'find/status: flux resource list works' '
124124
'
125125

126126
test_expect_success 'find/status: cancel jobs' '
127-
flux job cancel ${jobid1} &&
128-
flux job cancel ${jobid2} &&
127+
flux cancel ${jobid1} &&
128+
flux cancel ${jobid2} &&
129129
flux job wait-event -t 10 ${jobid2} clean
130130
'
131131

‎t/t1013-qmanager-priority.t‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ test_expect_success 'priority: 2 jobs with higher urgency will not run' '
3737
'
3838

3939
test_expect_success 'priority: canceling the first job starts the last job' '
40-
flux job cancel ${jobid1} &&
40+
flux cancel ${jobid1} &&
4141
flux job wait-event -t 10 ${jobid3} start
4242
'
4343

@@ -53,13 +53,13 @@ test_expect_success 'priority: change older job to higher urgency' '
5353
'
5454

5555
test_expect_success 'priority: canceling the running job starts the earlier job' '
56-
flux job cancel ${jobid3} &&
56+
flux cancel ${jobid3} &&
5757
flux job wait-event -t 10 ${jobid2} start
5858
'
5959

6060
test_expect_success 'priority: cancel all jobs' '
61-
flux job cancel ${jobid4} &&
62-
flux job cancel ${jobid2} &&
61+
flux cancel ${jobid4} &&
62+
flux cancel ${jobid2} &&
6363
flux job wait-event -t 10 ${jobid4} clean &&
6464
flux job wait-event -t 10 ${jobid2} release
6565
'

0 commit comments

Comments
 (0)