[ARVADOS] created: 6e09079c0459de11a9002453c9d7a1c19989fa6e

[Git user]

        at  6e09079c0459de11a9002453c9d7a1c19989fa6e (commit)


commit 6e09079c0459de11a9002453c9d7a1c19989fa6e
Author: Tom Clegg <tom at curoverse.com>
Date:   Fri Feb 10 16:15:24 2017 -0500

    11088: Fix keep_cache_ram units.

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 4c4db17..f7a523a 100644
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -103,7 +103,7 @@ class ArvadosContainer(object):
         runtime_req, _ = get_feature(self, "http://arvados.org/cwl#RuntimeConstraints")
         if runtime_req:
             if "keep_cache" in runtime_req:
-                runtime_constraints["keep_cache_ram"] = runtime_req["keep_cache"]
+                runtime_constraints["keep_cache_ram"] = runtime_req["keep_cache"] * 2**20
 
         partition_req, _ = get_feature(self, "http://arvados.org/cwl#PartitionRequirement")
         if partition_req:

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


hooks/post-receive
--