[ARVADOS] updated: 505c7f34a713906581329417a4e21ac932859926

Git user git at public.curoverse.com
Mon May 9 12:08:46 EDT 2016


Summary of changes:
 apps/workbench/Gemfile.lock                        |  74 ++++++----
 build/run-tests.sh                                 |  23 +--
 sdk/cli/arvados-cli.gemspec                        |   3 +-
 sdk/python/arvados/commands/put.py                 |  10 +-
 sdk/python/tests/test_api.py                       |   2 +-
 sdk/python/tests/test_arv_put.py                   |  16 +-
 services/api/Gemfile                               |   1 -
 services/api/Gemfile.lock                          |  45 +++---
 .../api/app/controllers/application_controller.rb  |   4 +-
 .../v1/api_client_authorizations_controller.rb     |   2 +-
 services/api/lib/eventbus.rb                       |   2 +-
 services/api/lib/load_param.rb                     |   8 +-
 services/api/lib/record_filters.rb                 |   2 +
 .../integration/collections_performance_test.rb    |  20 +--
 .../api/test/integration/database_reset_test.rb    |   3 +
 services/api/test/integration/websocket_test.rb    |  42 +++---
 services/api/test/test_helper.rb                   |   6 +-
 .../api/test/unit/collection_performance_test.rb   |   1 +
 .../crunch-dispatch-slurm/crunch-dispatch-slurm.go |   4 +-
 .../crunch-dispatch-slurm_test.go                  |   8 +-
 services/keepstore/azure_blob_volume.go            |  31 ++--
 services/keepstore/azure_blob_volume_test.go       |  18 +--
 services/keepstore/handler_test.go                 |  64 +++++++-
 services/keepstore/handlers.go                     |  85 ++++++++---
 .../keepstore/handlers_with_generic_volume_test.go |  26 ++--
 services/keepstore/keepstore.go                    |   1 +
 services/keepstore/keepstore_test.go               |  50 ++++---
 services/keepstore/logging_router.go               |  56 ++++---
 services/keepstore/logging_router_test.go          |  10 ++
 services/keepstore/s3_volume.go                    |  10 +-
 services/keepstore/trash_worker_test.go            |  16 +-
 services/keepstore/volume.go                       |  21 ++-
 services/keepstore/volume_generic_test.go          | 164 ++++++++++-----------
 services/keepstore/volume_test.go                  |  11 +-
 services/keepstore/volume_unix.go                  |  24 ++-
 services/keepstore/volume_unix_test.go             |   8 +-
 .../arvnodeman/computenode/driver/__init__.py      |   6 +-
 .../nodemanager/tests/test_computenode_driver.py   |  61 ++++++++
 38 files changed, 592 insertions(+), 346 deletions(-)
 create mode 100644 services/keepstore/logging_router_test.go
 create mode 100644 services/nodemanager/tests/test_computenode_driver.py

       via  505c7f34a713906581329417a4e21ac932859926 (commit)
       via  9bd0009d81d3bcdb1b1b1b3ff070537b6ff68f54 (commit)
       via  1a39dff7af0bb939cff4b1e0521e9945d13f023f (commit)
       via  be414b02c5e6063a5c5045ebcf77337915f39f1d (commit)
       via  50f8ae2c283cb65d61cae70c29bf6a5bdaa26bf9 (commit)
       via  5bd65b09716c720ecdb154c7cbeb5be80a1b5e8f (commit)
       via  c7259164cd07f09b5d63f39ddc850c50f249ded2 (commit)
       via  2814672fee49d8b02b7ea82a8e8a90504fc85d41 (commit)
       via  8b1479352382feb55c576c00e797e50917c1d91c (commit)
       via  959f37498c5f1610612452ab227ba4680b30e8e6 (commit)
       via  fba69e99ccafb4c956e688e8fef3d2f71100ed95 (commit)
       via  bd8aa1d7990b241639de4f200223da7794f14643 (commit)
       via  497fdb2505efa9a3231c39ec696da6b749d30af2 (commit)
       via  149957a7a86cd9fae98edfdc9c797d16656b3684 (commit)
       via  721bd171547f1c1ddcce5532a96f9bb801800757 (commit)
       via  96aad215edcc0f314216c07df9246799665dd19d (commit)
       via  71cca58c580f919c01e0f5fc7b6f469cef3b03c6 (commit)
       via  e8ccb474e5dbfee3d600fdd5ac3218ccb4625eb6 (commit)
       via  12b5d95d9d4f062539c3d7d7ac8dd5421dd6b6b0 (commit)
      from  f1adedeba07502273d39084d4ff3645b30067579 (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 505c7f34a713906581329417a4e21ac932859926
Author: radhika <radhika at curoverse.com>
Date:   Mon May 9 12:08:15 2016 -0400

    8017: mem-per-cpu

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 07653b1..096420f 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -6,6 +6,7 @@ import (
 	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
 	"io/ioutil"
 	"log"
+	"math"
 	"os"
 	"os/exec"
 	"os/signal"
@@ -140,9 +141,10 @@ 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))
 	return exec.Command("sbatch", "--share", "--parsable",
 		"--job-name="+container.UUID,
-		"--mem="+strconv.Itoa(container.RuntimeConstraints["ram"]),
+		"--mem-per-cpu="+strconv.Itoa(int(memPerCPU)),
 		"--cpus-per-task="+strconv.Itoa(container.RuntimeConstraints["vcpus"]))
 }
 
diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
index 82675b2..5994cdc 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
+	"math"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -113,10 +114,11 @@ func (s *TestSuite) Test_doMain(c *C) {
 	err = doMain()
 	c.Check(err, IsNil)
 
+	item := containers.Items[0]
 	sbatchCmdComps := []string{"sbatch", "--share", "--parsable",
-		fmt.Sprintf("--job-name=%s", containers.Items[0].UUID),
-		fmt.Sprintf("--mem=%s", strconv.Itoa(containers.Items[0].RuntimeConstraints["ram"])),
-		fmt.Sprintf("--cpus-per-task=%s", strconv.Itoa(containers.Items[0].RuntimeConstraints["vcpus"]))}
+		fmt.Sprintf("--job-name=%s", item.UUID),
+		fmt.Sprintf("--mem-per-cpu=%s", strconv.Itoa(int(math.Ceil(float64(item.RuntimeConstraints["ram"])/float64(item.RuntimeConstraints["vcpus"]*1048576))))),
+		fmt.Sprintf("--cpus-per-task=%s", strconv.Itoa(item.RuntimeConstraints["vcpus"]))}
 	c.Check(sbatchCmdLine, DeepEquals, sbatchCmdComps)
 
 	c.Check(striggerCmdLine, DeepEquals, []string{"strigger", "--set", "--jobid=zzzzz-dz642-queuedcontainer\n", "--fini",

commit 9bd0009d81d3bcdb1b1b1b3ff070537b6ff68f54
Merge: f1adede 1a39dff
Author: radhika <radhika at curoverse.com>
Date:   Mon May 9 10:34:47 2016 -0400

    Merge branch 'master' into 8017-slurm-runtime-constraints


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list