arvados-cli 0.1.20150319151231 → 0.1.20150323181012

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 707e00b4501d9a6d31a2625fcb92f831c9ec1274
-  data.tar.gz: a45c9df6b6c09e576822d680d260f46360a6ec9a
+  metadata.gz: d2252134e27620eaa1147541b7454f7aca71f0eb
+  data.tar.gz: 2d196c22729eb463cddc1016d51d7a27e7c5559e
 SHA512:
-  metadata.gz: 09ccbacb48017459baec47b92b91d2817e91f2988ef48cd6ddebd8be4dcdf16bc6e51615ca5a9bb5b64c900b869ecfba17741c4ab2291cfc2d4f374ed428c7de
-  data.tar.gz: c1f3a2469ebcb197ce10dec6e5e3bc69309aca7a85dc597ecfd2b72e4c9db7b21ed4d5e14a94a2bf92143d550a297198293fa257879e4f026754ca45bcc5b4b6
+  metadata.gz: b15ca8ad6b008a4eadbca525f5c6f58b170fc158f5dd63e62a7f2f4b2b316cc39f2eb47845da2220d7ab17bcaccca116fd69a74839d7ca7865c445147707c035
+  data.tar.gz: 12046acc2de9a57f0f02375604c9cb185710cf0331d6f9ed76bc0a4722119667abc038ec9ae7a0f1f3dd8f1e567430fa06aa0a5e276fe2d31777aefdadf675fd

data/bin/crunch-job

@@ -719,13 +719,15 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
     my $command =
 	"if [ -e $ENV{TASK_WORK} ]; then rm -rf $ENV{TASK_WORK}; fi; "
         ."mkdir -p $ENV{CRUNCH_TMP} $ENV{JOB_WORK} $ENV{TASK_WORK} $ENV{TASK_KEEPMOUNT} "
-	."&& cd $ENV{CRUNCH_TMP} ";
+	."&& cd $ENV{CRUNCH_TMP} "
+        ."&& MEM=\$(cat /proc/meminfo | grep MemTotal | sed 's/\\s\\s*/ /g' |cut -d' ' -f2) "
+        ."&& MEMLIMIT=\$(( (\$MEM * 95) / ($ENV{CRUNCH_NODE_SLOTS} * 100) )) ";
     $command .= "&& exec arv-mount --by-id --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
     if ($docker_hash)
     {
       my $cidfile = "$ENV{CRUNCH_TMP}/$Jobstep->{arvados_task}->{uuid}-$Jobstep->{failures}.cid";
       $command .= "crunchstat -cgroup-root=/sys/fs/cgroup -cgroup-parent=docker -cgroup-cid=$cidfile -poll=10000 ";
-      $command .= "$docker_bin run --rm=true --attach=stdout --attach=stderr --attach=stdin -i --user=crunch --cidfile=$cidfile --sig-proxy ";
+      $command .= "$docker_bin run --rm=true --attach=stdout --attach=stderr --attach=stdin -i --user=crunch --cidfile=$cidfile --sig-proxy --memory=\${MEMLIMIT}k ";
 
       # Dynamically configure the container to use the host system as its
       # DNS server.  Get the host's global addresses from the ip command,
@@ -1233,7 +1235,7 @@ sub preprocess_stderr
       # whoa.
       $main::please_freeze = 1;
     }
-    elsif ($line =~ /srun: error: (Node failure on|Unable to create job step|.*: Communication connection failure)/) {
+    elsif ($line =~ /(srun: error: (Node failure on|Unable to create job step|.*: Communication connection failure))|arvados.errors.Keep/) {
       $jobstep[$job]->{node_fail} = 1;
       ban_node_by_slot($jobstep[$job]->{slotindex});
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20150319151231
+  version: 0.1.20150323181012
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -178,7 +178,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: Arvados command line tools, git commit 4925686f6aa7214568ebd60be3acaa49dbf9dd1a
+description: Arvados command line tools, git commit c1b4ee5b62630d6df3037955b68aa77ec3ee1f5a
 email: gem-dev@curoverse.com
 executables:
 - arv