[ARVADOS] created: 1.1.3-146-g53dc92a

[Git user]

        at  53dc92af621bb2064e922b82e88572f5180c503a (commit)


commit 53dc92af621bb2064e922b82e88572f5180c503a
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Mar 6 17:14:24 2018 -0500

    13078: Ignore held jobs with priority=0 (e.g., SLURM 15.x).
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/crunch-dispatch-slurm/squeue.go b/services/crunch-dispatch-slurm/squeue.go
index df3c868..8862d16 100644
--- a/services/crunch-dispatch-slurm/squeue.go
+++ b/services/crunch-dispatch-slurm/squeue.go
@@ -79,6 +79,14 @@ func (sqc *SqueueChecker) reniceAll() {
 			// (perhaps it's not an Arvados job)
 			continue
 		}
+		if j.priority == 0 {
+			// SLURM <= 15.x implements "hold" by setting
+			// priority to 0. If we include held jobs
+			// here, we'll end up trying to push other
+			// jobs below them using negative priority,
+			// which won't help anything.
+			continue
+		}
 		jobs = append(jobs, j)
 	}
 
diff --git a/services/crunch-dispatch-slurm/squeue_test.go b/services/crunch-dispatch-slurm/squeue_test.go
index 694a4d6..11f7c48 100644
--- a/services/crunch-dispatch-slurm/squeue_test.go
+++ b/services/crunch-dispatch-slurm/squeue_test.go
@@ -46,6 +46,12 @@ func (s *SqueueSuite) TestReniceAll(c *C) {
 			want:   map[string]int64{uuids[0]: 999, uuids[1]: 1},
 			expect: [][]string{{uuids[0], "0"}, {uuids[1], "112"}},
 		},
+		{ // ignore fake2 because slurm priority=0
+			spread: 1,
+			squeue: uuids[0] + " 10000 4294000000\n" + uuids[1] + " 10000 4294000111\n" + uuids[2] + " 10000 0\n",
+			want:   map[string]int64{uuids[0]: 999, uuids[1]: 1, uuids[2]: 997},
+			expect: [][]string{{uuids[0], "0"}, {uuids[1], "112"}},
+		},
 	} {
 		c.Logf("spread=%d squeue=%q want=%v -> expect=%v", test.spread, test.squeue, test.want, test.expect)
 		slurm := &slurmFake{

commit a67b550e12bcf12a8f67ef1472b2dce013747712
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Mar 6 17:11:35 2018 -0500

    13078: Remove debug log.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/services/crunch-dispatch-slurm/squeue.go b/services/crunch-dispatch-slurm/squeue.go
index c0b2e41..df3c868 100644
--- a/services/crunch-dispatch-slurm/squeue.go
+++ b/services/crunch-dispatch-slurm/squeue.go
@@ -90,7 +90,6 @@ func (sqc *SqueueChecker) reniceAll() {
 		if renice[i] == job.nice {
 			continue
 		}
-		log.Printf("updating slurm priority for %q: nice %d => %d", job.uuid, job.nice, renice[i])
 		sqc.Slurm.Renice(job.uuid, renice[i])
 	}
 }

-----------------------------------------------------------------------


hooks/post-receive
--