[ARVADOS] updated: 1.1.4-550-g4e714090c

[Git user]

Summary of changes:
 apps/workbench/app/controllers/work_units_controller.rb |  2 +-
 doc/user/cwl/cwl-extensions.html.textile.liquid         | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

       via  4e714090c2c81cddcef6da393b5680f3fcfe40b1 (commit)
      from  0425dc10d6341a91b07665d8c0857bcd157967dd (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 4e714090c2c81cddcef6da393b5680f3fcfe40b1
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Thu Jul 5 15:15:16 2018 -0400

    13681:  Update documentation for arv:WorkflowRunnerResources
    
    Also bring default allocation for cwl-runner launched by workbench in
    line with a-c-r command line (1 GiB / 1 core).
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/app/controllers/work_units_controller.rb b/apps/workbench/app/controllers/work_units_controller.rb
index 0fe68476e..a229654c3 100644
--- a/apps/workbench/app/controllers/work_units_controller.rb
+++ b/apps/workbench/app/controllers/work_units_controller.rb
@@ -98,7 +98,7 @@ class WorkUnitsController < ApplicationController
       # runtime constriants
       runtime_constraints = {
         "vcpus" => 1,
-        "ram" => 256000000,
+        "ram" => 1024 * 1024 * 1024,
         "API" => true
       }
 
diff --git a/doc/user/cwl/cwl-extensions.html.textile.liquid b/doc/user/cwl/cwl-extensions.html.textile.liquid
index cf25639b1..ca1f64c96 100644
--- a/doc/user/cwl/cwl-extensions.html.textile.liquid
+++ b/doc/user/cwl/cwl-extensions.html.textile.liquid
@@ -38,6 +38,9 @@ hints:
     enableReuse: false
   cwltool:Secrets:
     secrets: [input1, input2]
+  arv:WorkflowRunnerResources:
+    ramMin: 2048
+    coresMin: 2
 </pre>
 
 The one exception to this is @arv:APIRequirement@, see note below.
@@ -111,3 +114,12 @@ Indicate that one or more input parameters are "secret".  Must be applied at the
 table(table table-bordered table-condensed).
 |_. Field |_. Type |_. Description |
 |secrets|array<string>|Input parameters which are considered "secret".  Must be strings.|
+
+h2. arv:WorkflowRunnerResources
+
+Specify resource requirements for the workflow runner process (arvados-cwl-runner) that manages a workflow run.  Must be applied to the top level workflow.  Will also be set implicitly when using @--submit-runner-ram@ on the command line along with @--create-workflow@ or @--update-workflow at .  Use this to adjust the runner's allocation if the workflow runner is getting "out of memory" exceptions or being killed by the out-of-memory (OOM) killer.
+
+table(table table-bordered table-condensed).
+|_. Field |_. Type |_. Description |
+|ramMin|int|RAM, in mebibytes, to reserve for the arvados-cwl-runner process. Default 1 GiB|
+|coresMin|int|Number of cores to reserve to the arvados-cwl-runner process. Default 1 core.|

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


hooks/post-receive
--