Merge branch '12552-slurm-priority'

refs #12552

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

diff --cc services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index f77023697e0f54ccaa12e2e7bc1bf3dd39f71509,dab6025cd832fefdc1e5c0043913c078905bb2ef..23e4b3a8cb456aac06f644c0219148967586fe71
--- 1/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
--- 2/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 {