Merge branch 'wtsi/14110-c-d-s-limit-slurm-concurrency' refs #14110
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Wed, 5 Sep 2018 18:47:19 +0000 (14:47 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Wed, 5 Sep 2018 18:47:19 +0000 (14:47 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

1  2 
services/crunch-dispatch-slurm/crunch-dispatch-slurm.go

index ce0360261dab4aa3ab424d27c29c782e268b567f,16d9fd18db2765adb6aa05ab1d742660f51790d8..084700d39bfad76b109078f29e81ecf82c40c5be
@@@ -176,9 -159,8 +176,9 @@@ func (disp *Dispatcher) setup() 
        }
        arv.Retries = 25
  
-       disp.slurm = &slurmCLI{}
+       disp.slurm = NewSlurmCLI()
        disp.sqCheck = &SqueueChecker{
 +              Logger:         disp.logger,
                Period:         time.Duration(disp.PollPeriod),
                PrioritySpread: disp.PrioritySpread,
                Slurm:          disp.slurm,