arvados-cli 0.1.20140826153331 → 0.1.20140826202602

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46fabe4ef40420550ed96ff11645ea0a3aee2bd7
-  data.tar.gz: 195dab2945794963ea3b34e02b25ca8bb552ed03
+  metadata.gz: bd9ebb9dddabe78ad6456c8b5c23279b368b5305
+  data.tar.gz: 2c834b9059f65215ef592b2af0e7d8a9aebe4ef8
 SHA512:
-  metadata.gz: 204577cff475cac903763e1c9697dd8f3c15636da66fc90aea2c27ae794c2880a516ca7806fc177fecca736f819a82bd113324f65f2cc82f923a223ae1be54a6
-  data.tar.gz: e3134fae83b9349b288d837c287693ff17947ac37723696dfb4572490d36cbc5c4543881b0f94b1ede7c3d95486fca43eee027a60325318a702485be60c9bc76
+  metadata.gz: cfe2966a72aa3e109bf42d00fac24309aacebb07557190db14a94c7bfd4579ebe535c2a8be68fcde68f5f818de20252b00771b2385fdecdc05b7b1043c744d7d
+  data.tar.gz: c8e032348584d3b812e75be31371773b783c918a3a6d4c82c1d562d3979f2bc1aaf75dbd4f6331f4aa1c58b09510babed4df61a740b25d7bd316839604cb6ea8

data/bin/crunch-job

@@ -487,6 +487,8 @@ else
     croak ("could not figure out commit id for $treeish");
   }
 
+  # Note: this section is almost certainly unnecessary if we're
+  # running tasks in docker containers.
   my $installpid = fork();
   if ($installpid == 0)
   {
@@ -654,8 +656,6 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
     if ($build_script)
     {
       $build_script_to_send = $build_script;
-      $command .=
-	  "&& perl -";
     }
     $command .= "&& exec arv-mount --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
     if ($docker_hash)
@@ -668,7 +668,6 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
       $command .=
           q{$(ip -o address show scope global |
               gawk 'match($4, /^([0-9\.:]+)\//, x){print "--dns", x[1]}') };
-      $command .= "--volume=\Q$ENV{CRUNCH_SRC}:/tmp/crunch-src:ro\E ";
       $command .= "--volume=\Q$ENV{TASK_KEEPMOUNT}:/keep:ro\E ";
       $command .= "--env=\QHOME=/home/crunch\E ";
       while (my ($env_key, $env_val) = each %ENV)
@@ -686,11 +685,13 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
       $command .= "--env=\QCRUNCH_SRC=/tmp/crunch-src\E ";
       $command .= "\Q$docker_hash\E ";
       $command .= "stdbuf --output=0 --error=0 ";
+      $command .= "perl - ";
       $command .= "/tmp/crunch-src/crunch_scripts/" . $Job->{"script"};
     } else {
       # Non-docker run
       $command .= "crunchstat -cgroup-root=/sys/fs/cgroup -poll=10000 ";
       $command .= "stdbuf --output=0 --error=0 ";
+      $command .= "perl - ";
       $command .= "$ENV{CRUNCH_SRC}/crunch_scripts/" . $Job->{"script"};
     }
 
@@ -1504,9 +1505,11 @@ my $commit = $ENV{"CRUNCH_SRC_COMMIT"};
 my $repo = $ENV{"CRUNCH_SRC_URL"};
 my $task_work = $ENV{"TASK_WORK"};
 
-if ($task_work) {
-    make_path $task_work;
-    -e $task_work or die "Failed to create temporary working directory ($task_work): $!";
+for my $dir ($destdir, $task_work) {
+    if ($dir) {
+        make_path $dir;
+        -e $dir or die "Failed to create temporary directory ($dir): $!";
+    }
 }
 
 open L, ">", "$destdir.lock" or die "$destdir.lock: $!";
@@ -1558,7 +1561,11 @@ if ($commit) {
 
 close L;
 
-exit 0;
+if (@ARGV) {
+    exec(@ARGV);
+} else {
+    exit 0;
+}
 
 sub shell_or_die
 {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140826153331
+  version: 0.1.20140826202602
 platform: ruby
 authors:
 - Arvados Authors
@@ -166,7 +166,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: This is the Arvados SDK CLI gem, git revision b15e80cdfa29e4bd39f207c8e1d5970373d0d7a1
+description: This is the Arvados SDK CLI gem, git revision 63330000144108862a4e2b02a7a8fa124d01163e
 email: gem-dev@curoverse.com
 executables:
 - arv