[ARVADOS] updated: a06d87af46cb235b9764d9383e46c3e02823c49c

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/crunch-job | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

       via  a06d87af46cb235b9764d9383e46c3e02823c49c (commit)
      from  7f83b8600e45216c2de47cad06b7eaff4ad5c9cd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a06d87af46cb235b9764d9383e46c3e02823c49c
Author: Tim Pierce <twp at curoverse.com>
Date:   Tue Dec 2 15:53:37 2014 -0500

    4621: code review feedback
    
    Removed @jobstep == 1 optimization (no longer appropriate now that we
    expect this function to always return the hash of a collection).
    
    Clarified error message for timeout errors.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 10069fb..725e2f4 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -1279,7 +1279,6 @@ sub create_output_collection
                   '.execute()["portable_data_hash"]'
       );
 
-  my $joboutput;
   for (@jobstep)
   {
     next if (!exists $_->{'arvados_task'}->{'output'} ||
@@ -1290,11 +1289,6 @@ sub create_output_collection
       $output_in_keep ||= $output =~ / [0-9a-f]{32}\S*\+K/;
       print $child_in $output;
     }
-    elsif (@jobstep == 1)
-    {
-      $joboutput = $output;
-      last;
-    }
     elsif (defined (my $outblock = fetch_block ($output)))
     {
       $output_in_keep ||= $outblock =~ / [0-9a-f]{32}\S*\+K/;
@@ -1308,15 +1302,14 @@ sub create_output_collection
   }
   $child_in->close;
 
-  if (!defined $joboutput) {
-    my $s = IO::Select->new($child_out);
-    if ($s->can_read(120)) {
-      sysread($child_out, $joboutput, 64 * 1024 * 1024);
-      chomp($joboutput);
-      # TODO: Ensure exit status == 0.
-    } else {
-      Log (undef, "timed out reading portable_data_hash");
-    }
+  my $joboutput;
+  my $s = IO::Select->new($child_out);
+  if ($s->can_read(120)) {
+    sysread($child_out, $joboutput, 64 * 1024 * 1024);
+    chomp($joboutput);
+    # TODO: Ensure exit status == 0.
+  } else {
+    Log (undef, "timed out while creating output collection");
   }
   # TODO: kill $pid instead of waiting, now that we've decided to
   # ignore further output.

-----------------------------------------------------------------------


hooks/post-receive
--