[ARVADOS] updated: a32c69b81296860a30cc33909226d9294f411adf

[Git user]

Summary of changes:
 services/api/test/fixtures/containers.yml             |  6 ++++++
 .../crunch-dispatch-slurm/crunch-dispatch-slurm.go    | 19 +++++++++++++------
 .../crunch-dispatch-slurm_test.go                     | 19 ++++++++++++++-----
 3 files changed, 33 insertions(+), 11 deletions(-)

       via  a32c69b81296860a30cc33909226d9294f411adf (commit)
       via  da2e9a5602276637b6780e8d5a64631219eac365 (commit)
       via  48c0b2f90d232d1508f1a6c8214c1b8e33c78795 (commit)
       via  37a00e62fa74ce162ee13d16c731dc10218c5df3 (commit)
       via  b5e2bbb94cd7e121d4b8d83af86ef0ab0c449dcf (commit)
       via  1695ccb6279de083eeed80d36d38f607a5c7098d (commit)
       via  505c7f34a713906581329417a4e21ac932859926 (commit)
       via  9bd0009d81d3bcdb1b1b1b3ff070537b6ff68f54 (commit)
       via  f1adedeba07502273d39084d4ff3645b30067579 (commit)
      from  44f0e83d50f688bf73c336747402d490346f5c34 (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 a32c69b81296860a30cc33909226d9294f411adf
Merge: 44f0e83 da2e9a5
Author: radhika <radhika at curoverse.com>
Date:   Tue May 10 13:35:24 2016 -0400

    closes #8017
    Merge branch '8017-slurm-runtime-constraints'


commit da2e9a5602276637b6780e8d5a64631219eac365
Author: radhika <radhika at curoverse.com>
Date:   Tue May 10 13:34:34 2016 -0400

    8017: RuntimeConstraints uses int64

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 8c3f5c9..f45c2a1 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -141,7 +141,7 @@ func dispatchSlurm(priorityPollInterval int, crunchRunCommand, finishCommand str
 
 // sbatchCmd
 func sbatchFunc(container Container) *exec.Cmd {
-	memPerCPU := math.Ceil(float64(container.RuntimeConstraints["ram"]) / float64(container.RuntimeConstraints["vcpus"]*1048576))
+	memPerCPU := math.Ceil((float64(container.RuntimeConstraints["ram"])) / (float64(container.RuntimeConstraints["vcpus"]*1048576)))
 	return exec.Command("sbatch", "--share", "--parsable",
 		"--job-name="+container.UUID,
 		"--mem-per-cpu="+strconv.Itoa(int(memPerCPU)),

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


hooks/post-receive
--