X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/b50ea3465244e66ecf2a852f598f5b576e705017..79bce4a71a58118a9003882e0ca9bbfb9d2957a9:/services/crunch-dispatch-slurm/slurm.go

diff --git a/services/crunch-dispatch-slurm/slurm.go b/services/crunch-dispatch-slurm/slurm.go
index bd193778b3..791f294df1 100644
--- a/services/crunch-dispatch-slurm/slurm.go
+++ b/services/crunch-dispatch-slurm/slurm.go
@@ -13,13 +13,22 @@ import (
 )
 
 type Slurm interface {
+	Batch(script io.Reader, args []string) error
 	Cancel(name string) error
-	Renice(name string, nice int) error
 	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 {
+	runSemaphore chan bool
 }
 
-type slurmCLI struct{}
+func NewSlurmCLI() *slurmCLI {
+	return &slurmCLI{
+		runSemaphore: make(chan bool, 3),
+	}
+}
 
 func (scli *slurmCLI) Batch(script io.Reader, args []string) error {
 	return scli.run(script, "sbatch", args)
@@ -54,11 +63,17 @@ func (scli *slurmCLI) QueueCommand(args []string) *exec.Cmd {
 	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)})
 }
 
 func (scli *slurmCLI) run(stdin io.Reader, prog string, args []string) error {
+	scli.runSemaphore <- true
+	defer func() { <-scli.runSemaphore }()
 	cmd := exec.Command(prog, args...)
 	cmd.Stdin = stdin
 	out, err := cmd.CombinedOutput()