From: Peter Amstutz <pamstutz@veritasgenetics.com>
Date: Wed, 5 Sep 2018 18:47:19 +0000 (-0400)
Subject: Merge branch 'wtsi/14110-c-d-s-limit-slurm-concurrency' refs #14110
X-Git-Tag: 1.3.0~121
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/e780e337d170036a69879debeb347a9c26a81518

Merge branch 'wtsi/14110-c-d-s-limit-slurm-concurrency' refs #14110

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
---

e780e337d170036a69879debeb347a9c26a81518
diff --cc services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index ce0360261d,16d9fd18db..084700d39b
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@@ -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,