arvados-cli 0.1.20140604172449 → 0.1.20140606094813
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 +7 -2
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 017807027b254fae57e10964fd3c397472988de0
|
|
4
|
+
data.tar.gz: 0d80cdd9447ff4b93287c21166ff2d1f1ab0a8d9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 49158497d7def0a098cb8ed6e1066a45ab8ae1e801c0ed027059db9c8497213d462a4c47c98f4b558b1ac5112c7ab63923dddf4f53c4fe2f87be1837effb0d4d
|
|
7
|
+
data.tar.gz: b95cea73e2ad5a2a6e9a645b267867ff9a08c35c6dbb3fa0b81227e74993b799cdb126fd86e09695f978c814b169a2ca2244094a1914b89cb65989ae97c6880c
|
data/bin/crunch-job
CHANGED
|
@@ -641,7 +641,8 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
|
|
|
641
641
|
$command .= "&& exec arv-mount --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
|
|
642
642
|
if ($docker_image)
|
|
643
643
|
{
|
|
644
|
-
$command .= "
|
|
644
|
+
$command .= "crunchstat -cgroup-parent=/sys/fs/cgroup/lxc -cgroup-cid=$ENV{TASK_WORK}/docker.cid -poll=1000 ";
|
|
645
|
+
$command .= "$docker_bin run -i -a stdin -a stdout -a stderr -cidfile=$ENV{TASK_WORK}/docker.cid ";
|
|
645
646
|
# Dynamically configure the container to use the host system as its
|
|
646
647
|
# DNS server. Get the host's global addresses from the ip command,
|
|
647
648
|
# and turn them into docker --dns options using gawk.
|
|
@@ -654,9 +655,13 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
|
|
|
654
655
|
}
|
|
655
656
|
while (my ($env_key, $env_val) = each %ENV)
|
|
656
657
|
{
|
|
657
|
-
$
|
|
658
|
+
if ($env_key =~ /^(JOB|TASK)_/) {
|
|
659
|
+
$command .= "-e \Q$env_key=$env_val\E ";
|
|
660
|
+
}
|
|
658
661
|
}
|
|
659
662
|
$command .= "\Q$docker_image\E ";
|
|
663
|
+
} else {
|
|
664
|
+
$command .= "crunchstat -cgroup-path=/sys/fs/cgroup "
|
|
660
665
|
}
|
|
661
666
|
$command .= "$ENV{CRUNCH_SRC}/crunch_scripts/" . $Job->{"script"};
|
|
662
667
|
my @execargs = ('bash', '-c', $command);
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
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.20140606094813
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Arvados Authors
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-06-
|
|
11
|
+
date: 2014-06-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: arvados
|
|
@@ -146,7 +146,7 @@ dependencies:
|
|
|
146
146
|
- - "~>"
|
|
147
147
|
- !ruby/object:Gem::Version
|
|
148
148
|
version: '0.8'
|
|
149
|
-
description: This is the Arvados SDK CLI gem, git revision
|
|
149
|
+
description: This is the Arvados SDK CLI gem, git revision 35c20b4ad8220131f7f6bad6b3806a7d28df3ef3
|
|
150
150
|
email: gem-dev@curoverse.com
|
|
151
151
|
executables:
|
|
152
152
|
- arv
|