[ARVADOS] updated: c0eb54eaffd1dac69f4ea73742a69a2473669538

[Git user]

Summary of changes:
 services/crunch-dispatch-slurm/crunch-dispatch-slurm.go      | 3 +--
 services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

       via  c0eb54eaffd1dac69f4ea73742a69a2473669538 (commit)
      from  779c5400a4f376489f4abc8564f890f309ae3f20 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit c0eb54eaffd1dac69f4ea73742a69a2473669538
Author: Brett Smith <brett at curoverse.com>
Date:   Tue Jul 19 09:07:02 2016 -0400

    9262: Stop setting sbatch --priority in crunch-dispatch-slurm.
    
    There are a few reasons we want to back this out:
    
    * `--priority` is a relatively new feature of SLURM, added in 14.03,
      and it's not clear how many users are running that.
    * Setting `--priority` requires extra privileges, per the sbatch man
      page, and it's not clear crunch-dispatch-slurm should run with
      those.
    * There are multiple ways to set the "priority" of a SLURM job.
      There's also a niceness value.  Which is correct to use is probably
      ultimately going to depend on site rules or conventions.  We need to
      get more feedback on what people are doing before we implement
      something.  We might need configurations options along the lines of
      "translate container priority into this option with this scaling
      factor," or something like that.
    
    Per discussion with Tom Clegg.  Closes #9626.

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 46df528..0bf30da 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -75,8 +75,7 @@ func sbatchFunc(container arvados.Container) *exec.Cmd {
 	return exec.Command("sbatch", "--share",
 		fmt.Sprintf("--job-name=%s", container.UUID),
 		fmt.Sprintf("--mem-per-cpu=%d", int(memPerCPU)),
-		fmt.Sprintf("--cpus-per-task=%d", container.RuntimeConstraints.VCPUs),
-		fmt.Sprintf("--priority=%d", container.Priority))
+		fmt.Sprintf("--cpus-per-task=%d", container.RuntimeConstraints.VCPUs))
 }
 
 // scancelCmd
diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
index ede767c..af27832 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
@@ -98,8 +98,7 @@ func (s *TestSuite) TestIntegrationMissingFromSqueue(c *C) {
 	container := s.integrationTest(c, func() *exec.Cmd { return exec.Command("echo") }, []string{"sbatch", "--share",
 		fmt.Sprintf("--job-name=%s", "zzzzz-dz642-queuedcontainer"),
 		fmt.Sprintf("--mem-per-cpu=%d", 2862),
-		fmt.Sprintf("--cpus-per-task=%d", 4),
-		fmt.Sprintf("--priority=%d", 1)},
+		fmt.Sprintf("--cpus-per-task=%d", 4)},
 		func(dispatcher *dispatch.Dispatcher, container arvados.Container) {
 			dispatcher.UpdateState(container.UUID, dispatch.Running)
 			time.Sleep(3 * time.Second)

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


hooks/post-receive
--