From: Tom Clegg <tclegg@veritasgenetics.com>
Date: Thu, 1 Mar 2018 21:41:07 +0000 (-0500)
Subject: Merge branch '12552-slurm-priority'
X-Git-Tag: 1.1.4~61
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6346a7c4c0cb5d7e8c5f01392b6cc64d329b68ec

Merge branch '12552-slurm-priority'

refs #12552

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
---

6346a7c4c0cb5d7e8c5f01392b6cc64d329b68ec
diff --cc services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index f77023697e,dab6025cd8..23e4b3a8cb
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@@ -198,19 -198,8 +202,8 @@@ func (disp *Dispatcher) checkSqueueForO
  	}
  }
  
- func (disp *Dispatcher) niceness(priority int) int {
- 	if priority > 1000 {
- 		priority = 1000
- 	}
- 	if priority < 0 {
- 		priority = 0
- 	}
- 	// Niceness range 1-10000
- 	return (1000 - priority) * 10
- }
- 
  func (disp *Dispatcher) sbatchArgs(container arvados.Container) ([]string, error) {
 -	mem := int64(math.Ceil(float64(container.RuntimeConstraints.RAM+container.RuntimeConstraints.KeepCacheRAM) / float64(1048576)))
 +	mem := int64(math.Ceil(float64(container.RuntimeConstraints.RAM+container.RuntimeConstraints.KeepCacheRAM+disp.ReserveExtraRAM) / float64(1048576)))
  
  	var disk int64
  	for _, m := range container.Mounts {