arvados-cli 0.1.20160315010517 → 0.1.20160331222945
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 +8 -1
- 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: 1c738972b30fbe141b217d5ec94ce311ce8838ed
|
|
4
|
+
data.tar.gz: 68e2efaf0c0361dbeb2fbe9f06a721b7b83c9376
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3dc5ae689c7bf6bd7b2e9543a45e1d7e88247ccfdf1d3a188b2329f1f06621db0c862b76aae2e1969f5611128fd2b49e3fd417a2ce4c1822c9b11dc1af993b47
|
|
7
|
+
data.tar.gz: bdc42b1882e9985bca582dee2fec71c7fbf3fffd5cee6c760f5fc585ea4899a3050e9535fa14cfd837d4fe1da54be93dfaf0ea38941800784fd58a226e1b414d
|
data/bin/crunch-job
CHANGED
|
@@ -852,7 +852,10 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
|
|
|
852
852
|
.q{&& MEM=$(awk '($1 == "MemTotal:"){print $2}' </proc/meminfo) }
|
|
853
853
|
.q{&& SWAP=$(awk '($1 == "SwapTotal:"){print $2}' </proc/meminfo) }
|
|
854
854
|
."&& MEMLIMIT=\$(( (\$MEM * 95) / ($ENV{CRUNCH_NODE_SLOTS} * 100) )) "
|
|
855
|
-
."&& let SWAPLIMIT=\$MEMLIMIT+\$SWAP "
|
|
855
|
+
."&& let SWAPLIMIT=\$MEMLIMIT+\$SWAP "
|
|
856
|
+
."&& if which crunchrunner >/dev/null ; then VOLUME_CRUNCHRUNNER=\"--volume=\$(which crunchrunner):/usr/local/bin/crunchrunner\" ; fi "
|
|
857
|
+
."&& if test -f /etc/ssl/certs/ca-certificates.crt ; then VOLUME_CERTS=\"--volume=/etc/ssl/certs/ca-certificates.crt:/etc/arvados/ca-certificates.crt\" ; fi "
|
|
858
|
+
."&& if test -f /etc/pki/tls/certs/ca-bundle.crt ; then VOLUME_CERTS=\"--volume=/etc/pki/tls/certs/ca-bundle.crt:/etc/arvados/ca-certificates.crt\" ; fi ";
|
|
856
859
|
|
|
857
860
|
$command .= "&& exec arv-mount --read-write --mount-by-pdh=by_pdh --mount-tmp=tmp --crunchstat-interval=10 --allow-other $arv_file_cache \Q$keep_mnt\E --exec ";
|
|
858
861
|
$ENV{TASK_KEEPMOUNT} = "$keep_mnt/by_pdh";
|
|
@@ -917,6 +920,10 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
|
|
|
917
920
|
# For now, use the same approach as TASK_WORK above.
|
|
918
921
|
$ENV{"JOB_WORK"} = "/tmp/crunch-job-work";
|
|
919
922
|
|
|
923
|
+
# Bind mount the crunchrunner binary and host TLS certificates file into
|
|
924
|
+
# the container.
|
|
925
|
+
$command .= "\"\$VOLUME_CRUNCHRUNNER\" \"\$VOLUME_CERTS\" ";
|
|
926
|
+
|
|
920
927
|
while (my ($env_key, $env_val) = each %ENV)
|
|
921
928
|
{
|
|
922
929
|
if ($env_key =~ /^(ARVADOS|CRUNCH|JOB|TASK)_/) {
|
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.20160331222945
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Arvados Authors
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-03-
|
|
11
|
+
date: 2016-03-31 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: arvados
|
|
@@ -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 49743c080265b270693154d7a327d0433b0a7dbe
|
|
182
182
|
email: gem-dev@curoverse.com
|
|
183
183
|
executables:
|
|
184
184
|
- arv
|