arvados-cli 0.1.20150319151231 → 0.1.20150323181012
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/bin/crunch-job +5 -3
- 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: d2252134e27620eaa1147541b7454f7aca71f0eb
|
|
4
|
+
data.tar.gz: 2d196c22729eb463cddc1016d51d7a27e7c5559e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b15ca8ad6b008a4eadbca525f5c6f58b170fc158f5dd63e62a7f2f4b2b316cc39f2eb47845da2220d7ab17bcaccca116fd69a74839d7ca7865c445147707c035
|
|
7
|
+
data.tar.gz: 12046acc2de9a57f0f02375604c9cb185710cf0331d6f9ed76bc0a4722119667abc038ec9ae7a0f1f3dd8f1e567430fa06aa0a5e276fe2d31777aefdadf675fd
|
data/bin/crunch-job
CHANGED
|
@@ -719,13 +719,15 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
|
|
|
719
719
|
my $command =
|
|
720
720
|
"if [ -e $ENV{TASK_WORK} ]; then rm -rf $ENV{TASK_WORK}; fi; "
|
|
721
721
|
."mkdir -p $ENV{CRUNCH_TMP} $ENV{JOB_WORK} $ENV{TASK_WORK} $ENV{TASK_KEEPMOUNT} "
|
|
722
|
-
."&& cd $ENV{CRUNCH_TMP} "
|
|
722
|
+
."&& cd $ENV{CRUNCH_TMP} "
|
|
723
|
+
."&& MEM=\$(cat /proc/meminfo | grep MemTotal | sed 's/\\s\\s*/ /g' |cut -d' ' -f2) "
|
|
724
|
+
."&& MEMLIMIT=\$(( (\$MEM * 95) / ($ENV{CRUNCH_NODE_SLOTS} * 100) )) ";
|
|
723
725
|
$command .= "&& exec arv-mount --by-id --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
|
|
724
726
|
if ($docker_hash)
|
|
725
727
|
{
|
|
726
728
|
my $cidfile = "$ENV{CRUNCH_TMP}/$Jobstep->{arvados_task}->{uuid}-$Jobstep->{failures}.cid";
|
|
727
729
|
$command .= "crunchstat -cgroup-root=/sys/fs/cgroup -cgroup-parent=docker -cgroup-cid=$cidfile -poll=10000 ";
|
|
728
|
-
$command .= "$docker_bin run --rm=true --attach=stdout --attach=stderr --attach=stdin -i --user=crunch --cidfile=$cidfile --sig-proxy ";
|
|
730
|
+
$command .= "$docker_bin run --rm=true --attach=stdout --attach=stderr --attach=stdin -i --user=crunch --cidfile=$cidfile --sig-proxy --memory=\${MEMLIMIT}k ";
|
|
729
731
|
|
|
730
732
|
# Dynamically configure the container to use the host system as its
|
|
731
733
|
# DNS server. Get the host's global addresses from the ip command,
|
|
@@ -1233,7 +1235,7 @@ sub preprocess_stderr
|
|
|
1233
1235
|
# whoa.
|
|
1234
1236
|
$main::please_freeze = 1;
|
|
1235
1237
|
}
|
|
1236
|
-
elsif ($line =~ /srun: error: (Node failure on|Unable to create job step|.*: Communication connection failure)/) {
|
|
1238
|
+
elsif ($line =~ /(srun: error: (Node failure on|Unable to create job step|.*: Communication connection failure))|arvados.errors.Keep/) {
|
|
1237
1239
|
$jobstep[$job]->{node_fail} = 1;
|
|
1238
1240
|
ban_node_by_slot($jobstep[$job]->{slotindex});
|
|
1239
1241
|
}
|
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.20150323181012
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Arvados Authors
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-03-
|
|
11
|
+
date: 2015-03-23 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 c1b4ee5b62630d6df3037955b68aa77ec3ee1f5a
|
|
182
182
|
email: gem-dev@curoverse.com
|
|
183
183
|
executables:
|
|
184
184
|
- arv
|