X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d3e2fb85a39562e38ea67f84e9f065815450294a..c7d692a3f09d8116cc52591f8852c4e0d6e4ab3c:/apps/workbench/app/controllers/work_units_controller.rb diff --git a/apps/workbench/app/controllers/work_units_controller.rb b/apps/workbench/app/controllers/work_units_controller.rb index 8527b4d48c..0f0033ce49 100644 --- a/apps/workbench/app/controllers/work_units_controller.rb +++ b/apps/workbench/app/controllers/work_units_controller.rb @@ -3,7 +3,7 @@ # SPDX-License-Identifier: AGPL-3.0 class WorkUnitsController < ApplicationController - skip_around_filter :require_thread_api_token, if: proc { |ctrl| + skip_around_action :require_thread_api_token, if: proc { |ctrl| Rails.configuration.anonymous_user_token and 'show_child_component' == ctrl.action_name } @@ -85,12 +85,6 @@ class WorkUnitsController < ApplicationController attrs['state'] = "Uncommitted" # required - attrs['command'] = ["arvados-cwl-runner", - "--local", - "--api=containers", - "--project-uuid=#{params['work_unit']['owner_uuid']}", - "/var/lib/cwl/workflow.json#main", - "/var/lib/cwl/cwl.input.json"] attrs['container_image'] = "arvados/jobs" attrs['cwd'] = "/var/spool/cwl" attrs['output_path'] = "/var/spool/cwl" @@ -102,6 +96,7 @@ class WorkUnitsController < ApplicationController "API" => true } + keep_cache = 256 input_defaults = {} if wf_json main = get_cwl_main(wf_json) @@ -119,11 +114,22 @@ class WorkUnitsController < ApplicationController if hint[:ramMin] runtime_constraints["ram"] = hint[:ramMin] * 1024 * 1024 end + if hint[:keep_cache] + keep_cache = hint[:keep_cache] + end end end end end + attrs['command'] = ["arvados-cwl-runner", + "--local", + "--api=containers", + "--project-uuid=#{params['work_unit']['owner_uuid']}", + "--collection-cache-size=#{keep_cache}", + "/var/lib/cwl/workflow.json#main", + "/var/lib/cwl/cwl.input.json"] + # mounts mounts = { "/var/lib/cwl/cwl.input.json" => {