projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8650: test and fixture update
[arvados.git]
/
services
/
api
/
lib
/
crunch_dispatch.rb
diff --git
a/services/api/lib/crunch_dispatch.rb
b/services/api/lib/crunch_dispatch.rb
index 6300b14834f92cbf79a06a1fb062f512882f37af..ce94f737a2467f855a7156ba76873db57cd183ee 100644
(file)
--- a/
services/api/lib/crunch_dispatch.rb
+++ b/
services/api/lib/crunch_dispatch.rb
@@
-24,6
+24,7
@@
class CrunchDispatch
@docker_bin = ENV['CRUNCH_JOB_DOCKER_BIN']
@docker_run_args = ENV['CRUNCH_JOB_DOCKER_RUN_ARGS']
@docker_bin = ENV['CRUNCH_JOB_DOCKER_BIN']
@docker_run_args = ENV['CRUNCH_JOB_DOCKER_RUN_ARGS']
+ @cgroup_root = ENV['CRUNCH_CGROUP_ROOT']
@arvados_internal = Rails.configuration.git_internal_dir
if not File.exists? @arvados_internal
@arvados_internal = Rails.configuration.git_internal_dir
if not File.exists? @arvados_internal
@@
-384,6
+385,10
@@
class CrunchDispatch
'--job', job.uuid,
'--git-dir', @arvados_internal]
'--job', job.uuid,
'--git-dir', @arvados_internal]
+ if @cgroup_root
+ cmd_args += ['--cgroup-root', @cgroup_root]
+ end
+
if @docker_bin
cmd_args += ['--docker-bin', @docker_bin]
end
if @docker_bin
cmd_args += ['--docker-bin', @docker_bin]
end