[ARVADOS] created: 303d374c370f334426570864258df6364b9f3f0b

[Git user]

        at  303d374c370f334426570864258df6364b9f3f0b (commit)


commit 303d374c370f334426570864258df6364b9f3f0b
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed May 10 14:57:23 2017 -0400

    11369: Add keep_cache to base RAM request.

diff --git a/sdk/cwl/arvados_cwl/arvjob.py b/sdk/cwl/arvados_cwl/arvjob.py
index e86f505..0bf91f2 100644
--- a/sdk/cwl/arvados_cwl/arvjob.py
+++ b/sdk/cwl/arvados_cwl/arvjob.py
@@ -110,6 +110,7 @@ class ArvadosJob(object):
         if runtime_req:
             if "keep_cache" in runtime_req:
                 runtime_constraints["keep_cache_mb_per_task"] = runtime_req["keep_cache"]
+                runtime_constraints["min_ram_mb_per_node"] += runtime_req["keep_cache"]
             if "outputDirType" in runtime_req:
                 if runtime_req["outputDirType"] == "local_output_dir":
                     script_parameters["task.keepTmpOutput"] = False
diff --git a/sdk/cwl/tests/test_job.py b/sdk/cwl/tests/test_job.py
index 3061e2f..99dd3cb 100644
--- a/sdk/cwl/tests/test_job.py
+++ b/sdk/cwl/tests/test_job.py
@@ -134,7 +134,7 @@ class TestJob(unittest.TestCase):
                 'runtime_constraints': {
                     'docker_image': 'arvados/jobs',
                     'min_cores_per_node': 3,
-                    'min_ram_mb_per_node': 3000,
+                    'min_ram_mb_per_node': 3512,     # ramMin + keep_cache
                     'min_scratch_mb_per_node': 5024, # tmpdirSize + outdirSize
                     'keep_cache_mb_per_task': 512
                 }

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


hooks/post-receive
--