projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
12626: Merge branch 'master' into 12626-merge-accounts
[arvados.git]
/
services
/
crunch-dispatch-slurm
/
slurm.go
diff --git
a/services/crunch-dispatch-slurm/slurm.go
b/services/crunch-dispatch-slurm/slurm.go
index bd193778b38c2172b13987945cfd2df1c58e22ce..9e9f45270f82d3450d27e380fe63924177e5501d 100644
(file)
--- a/
services/crunch-dispatch-slurm/slurm.go
+++ b/
services/crunch-dispatch-slurm/slurm.go
@@
-13,10
+13,11
@@
import (
)
type Slurm interface {
)
type Slurm interface {
+ Batch(script io.Reader, args []string) error
Cancel(name string) error
Cancel(name string) error
- Renice(name string, nice int) error
QueueCommand(args []string) *exec.Cmd
QueueCommand(args []string) *exec.Cmd
- Batch(script io.Reader, args []string) error
+ Release(name string) error
+ Renice(name string, nice int64) error
}
type slurmCLI struct{}
}
type slurmCLI struct{}
@@
-54,7
+55,11
@@
func (scli *slurmCLI) QueueCommand(args []string) *exec.Cmd {
return exec.Command("squeue", args...)
}
return exec.Command("squeue", args...)
}
-func (scli *slurmCLI) Renice(name string, nice int) error {
+func (scli *slurmCLI) Release(name string) error {
+ return scli.run(nil, "scontrol", []string{"release", "Name=" + name})
+}
+
+func (scli *slurmCLI) Renice(name string, nice int64) error {
return scli.run(nil, "scontrol", []string{"update", "JobName=" + name, fmt.Sprintf("Nice=%d", nice)})
}
return scli.run(nil, "scontrol", []string{"update", "JobName=" + name, fmt.Sprintf("Nice=%d", nice)})
}