arvados-cli 0.1.20150227192315 → 0.1.20150316190023

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fee9adf2c5e05f6708bcac31dde6f59bf2fe0247
-  data.tar.gz: 32b1e5d39a1e99b697efdb7c4a46f071c241ef4c
+  metadata.gz: 588401acaf0d304d733e96d273fcdd9aa2784d23
+  data.tar.gz: b9b21e337625de3d064ec0d10176e9f8ba47b02d
 SHA512:
-  metadata.gz: a53ba2e71b329d22e97800f5aca9bd765f63e4155d17c4ca1883b0939dbc411a29591fa33fee741c04975b9ee4533a3b2ab0bd8814f237e29b549e32f49639e6
-  data.tar.gz: aab8e8575cb748acb045b39ad2d24ba0ef503468e3a503c3529fc98eb21ea44334dfc8a22eecc3615649af496b40142ad03661386c3cba4746ea8c7db5ff5966
+  metadata.gz: 762e7cfdeb67a3e7d32218626b8c63f68a566ea04321b3770e99f1c5928fc05e88c942f6160e6f735a817b81b74f8607a918313c384de01c8464aa533d5f428c
+  data.tar.gz: c7bdb2e8c86a07f38574f784e7d703df0da4c0fceac9d56a2a23590dc8aae960a0b1613509542ae7d0a08ecc098fdc13d4136d1c2c76edc691bae86aae62ed9d

data/bin/crunch-job

@@ -361,7 +361,7 @@ if (!defined $no_clear_tmp) {
     # TODO: When #5036 is done and widely deployed, we can get rid of the
     # regular expression and just unmount everything with type fuse.keep.
     srun (["srun", "--nodelist=$nodelist", "-D", $ENV{'TMPDIR'}],
-          ['bash', '-ec', 'mount -t fuse,fuse.keep | awk \'($3 ~ /\ykeep\y/){print $3}\' | xargs -r -n 1 fusermount -u -z; sleep 1; rm -rf $JOB_WORK $CRUNCH_INSTALL $CRUNCH_TMP/task $CRUNCH_TMP/src*']);
+          ['bash', '-ec', 'mount -t fuse,fuse.keep | awk \'($3 ~ /\ykeep\y/){print $3}\' | xargs -r -n 1 fusermount -u -z; sleep 1; rm -rf $JOB_WORK $CRUNCH_INSTALL $CRUNCH_TMP/task $CRUNCH_TMP/src* $CRUNCH_TMP/*.cid']);
     exit (1);
   }
   while (1)
@@ -384,7 +384,7 @@ if ($docker_locator = $Job->{docker_image_locator}) {
   }
   $docker_stream =~ s/^\.//;
   my $docker_install_script = qq{
-if ! $docker_bin images -q --no-trunc | grep -qxF \Q$docker_hash\E; then
+if ! $docker_bin images -q --no-trunc --all | grep -qxF \Q$docker_hash\E; then
     arv-get \Q$docker_locator$docker_stream/$docker_hash.tar\E | $docker_bin load
 fi
 };
@@ -670,6 +670,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
   my $childslotname = join (".",
 			    $slot[$childslot]->{node}->{name},
 			    $slot[$childslot]->{cpu});
+
   my $childpid = fork();
   if ($childpid == 0)
   {
@@ -721,7 +722,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
     $command .= "&& exec arv-mount --by-id --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
     if ($docker_hash)
     {
-      my $cidfile = "$ENV{CRUNCH_TMP}/$ENV{TASK_UUID}.cid";
+      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 ";
 
@@ -831,7 +832,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
 	 ||
 	 (@slot > @freeslot && $todo_ptr+1 > $#jobstep_todo))
   {
-    last THISROUND if $main::please_freeze;
+    last THISROUND if $main::please_freeze || defined($main::success);
     if ($main::please_info)
     {
       $main::please_info = 0;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20150227192315
+  version: 0.1.20150316190023
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-16 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 62fea2a463eb0d8c3aef84a56ba84561a196666b
+description: Arvados command line tools, git commit e3f359d1cf36bca2b675c495fcff0a76a89cbd38
 email: gem-dev@curoverse.com
 executables:
 - arv