projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 10293-container-request-output-uuid
[arvados.git]
/
services
/
crunch-dispatch-slurm
/
squeue.go
diff --git
a/services/crunch-dispatch-slurm/squeue.go
b/services/crunch-dispatch-slurm/squeue.go
index 34e6632b48aa11b84ef1ebadaea7cf9fafb21568..61decde61c4bd61d0a92e96bde20ff0c82780f57 100644
(file)
--- a/
services/crunch-dispatch-slurm/squeue.go
+++ b/
services/crunch-dispatch-slurm/squeue.go
@@
-19,7
+19,7
@@
type Squeue struct {
// squeueFunc
func squeueFunc() *exec.Cmd {
// squeueFunc
func squeueFunc() *exec.Cmd {
- return exec.Command("squeue", "--format=%j")
+ return exec.Command("squeue", "--
all", "--
format=%j")
}
var squeueCmd = squeueFunc
}
var squeueCmd = squeueFunc
@@
-45,7
+45,11
@@
func (squeue *Squeue) RunSqueue() {
log.Printf("Error creating stdout pipe for squeue: %v", err)
return
}
log.Printf("Error creating stdout pipe for squeue: %v", err)
return
}
- cmd.Start()
+ err = cmd.Start()
+ if err != nil {
+ log.Printf("Error running squeue: %v", err)
+ return
+ }
scanner := bufio.NewScanner(sq)
for scanner.Scan() {
newSqueueContents = append(newSqueueContents, scanner.Text())
scanner := bufio.NewScanner(sq)
for scanner.Scan() {
newSqueueContents = append(newSqueueContents, scanner.Text())