Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Slurm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tud-zih-energy
Slurm
Commits
ae53b836
Commit
ae53b836
authored
3 years ago
by
Albert Gil
Browse files
Options
Downloads
Patches
Plain Diff
Testsuite - Improve performance of cancel_job calling scancel just once
Bug 10439 Signed-off-by:
Scott Jackson
<
scottmo@schedmd.com
>
parent
a1ab6e64
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
testsuite/expect/globals
+10
-7
10 additions, 7 deletions
testsuite/expect/globals
with
10 additions
and
7 deletions
testsuite/expect/globals
+
10
−
7
View file @
ae53b836
...
@@ -1174,16 +1174,19 @@ proc run_command_status args {
...
@@ -1174,16 +1174,19 @@ proc run_command_status args {
proc cancel_job { job_id_list {het_job 0}} {
proc cancel_job { job_id_list {het_job 0}} {
global scancel
global scancel
set job_list_clean [list]
foreach job_id $job_id_list {
foreach job_id $job_id_list {
if {$job_id
=
= 0} {
if {$job_id
!
= 0} {
continue
lappend job_list_clean $job_id
}
}
}
log_debug "Cancelling $job_id"
log_debug "Cancelling $job_list_clean"
if {[run_command_status "$scancel -Q $job_id"]} {
if {[run_command_status "$scancel -Q $job_list_clean"]} {
log_warn "scancel command returned error"
log_warn "scancel command returned error"
return $::RETURN_ERROR
return $::RETURN_ERROR
}
}
foreach job_id $job_list_clean {
if {[wait_for_job $job_id "DONE" $het_job]} {
if {[wait_for_job $job_id "DONE" $het_job]} {
log_warn "Job $job_id not ended"
log_warn "Job $job_id not ended"
return $::RETURN_ERROR
return $::RETURN_ERROR
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment