arvados-cli 0.1.20151202175456 → 0.1.20151202215640
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/crunch-job +4 -2
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: cc310ed053399aa336ba979d70c4cdf2facde5b6
|
|
4
|
+
data.tar.gz: a1ed47157b3f81f49ffec497e0a59f9a60b3da43
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 57541f4f16823bae61e7e132ac45cf23b12701d02fdd5a241b89f321345faf830a80f746239fa21c7d29372806989d9ebf9758287280042c93123d3665213a55
|
|
7
|
+
data.tar.gz: 56add4fab3e5095e6fbde9b4993f9c0ec2ee6261f94435c13081e78e9694adee80d38d1d17162f4fa88d42ca93ff6fe67efdda00e1b98459bb968645d280d4b8
|
data/bin/crunch-job
CHANGED
|
@@ -127,6 +127,7 @@ my $job_api_token;
|
|
|
127
127
|
my $no_clear_tmp;
|
|
128
128
|
my $resume_stash;
|
|
129
129
|
my $docker_bin = "docker.io";
|
|
130
|
+
my $docker_run_args = "";
|
|
130
131
|
GetOptions('force-unlock' => \$force_unlock,
|
|
131
132
|
'git-dir=s' => \$git_dir,
|
|
132
133
|
'job=s' => \$jobspec,
|
|
@@ -134,6 +135,7 @@ GetOptions('force-unlock' => \$force_unlock,
|
|
|
134
135
|
'no-clear-tmp' => \$no_clear_tmp,
|
|
135
136
|
'resume-stash=s' => \$resume_stash,
|
|
136
137
|
'docker-bin=s' => \$docker_bin,
|
|
138
|
+
'docker-run-args=s' => \$docker_run_args,
|
|
137
139
|
);
|
|
138
140
|
|
|
139
141
|
if (defined $job_api_token) {
|
|
@@ -467,7 +469,7 @@ fi
|
|
|
467
469
|
}
|
|
468
470
|
srun(["srun", "--nodelist=" . $node[0]],
|
|
469
471
|
["/bin/sh", "-ec",
|
|
470
|
-
"a=`$docker_bin run $try_user_arg $docker_hash id --user` && " .
|
|
472
|
+
"a=`$docker_bin run $docker_run_args $try_user_arg $docker_hash id --user` && " .
|
|
471
473
|
" test \$a -ne 0"],
|
|
472
474
|
{fork => 1});
|
|
473
475
|
if ($? == 0) {
|
|
@@ -907,7 +909,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
|
|
|
907
909
|
my $containername = "$Jobstep->{arvados_task}->{uuid}-$Jobstep->{failures}";
|
|
908
910
|
my $cidfile = "$ENV{CRUNCH_TMP}/$containername.cid";
|
|
909
911
|
$command .= "crunchstat -cgroup-root=/sys/fs/cgroup -cgroup-parent=docker -cgroup-cid=$cidfile -poll=10000 ";
|
|
910
|
-
$command .= "$docker_bin run --name=$containername --attach=stdout --attach=stderr --attach=stdin -i \Q$dockeruserarg\E --cidfile=$cidfile --sig-proxy ";
|
|
912
|
+
$command .= "$docker_bin run $docker_run_args --name=$containername --attach=stdout --attach=stderr --attach=stdin -i \Q$dockeruserarg\E --cidfile=$cidfile --sig-proxy ";
|
|
911
913
|
# We only set memory limits if Docker lets us limit both memory and swap.
|
|
912
914
|
# Memory limits alone have been supported longer, but subprocesses tend
|
|
913
915
|
# to get SIGKILL if they exceed that without any swap limit set.
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: arvados-cli
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.20151202215640
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Arvados Authors
|
|
@@ -178,7 +178,7 @@ dependencies:
|
|
|
178
178
|
- - "<"
|
|
179
179
|
- !ruby/object:Gem::Version
|
|
180
180
|
version: 1.0.0
|
|
181
|
-
description: Arvados command line tools, git commit
|
|
181
|
+
description: Arvados command line tools, git commit 00ef3e9dc7240a5ce5bd94d1a358120fa5a35835
|
|
182
182
|
email: gem-dev@curoverse.com
|
|
183
183
|
executables:
|
|
184
184
|
- arv
|