arvados-cli 0.1.20151111160124 → 0.1.20151113142812

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9871ad8965822ce0d375df3c91229e9b458c84f0
-  data.tar.gz: 21c273ce4146f3bb5fbccd9f784336401deb763f
+  metadata.gz: 9bcb8ae09c736d9865677d82cb6323910af2a295
+  data.tar.gz: c5fc1244bbc70e3e8f877e0e47df628988737a79
 SHA512:
-  metadata.gz: 3f86c42d920b2f550567b09a549b893de9200915d1ac5f84cebed30ae0070ab9a39164e42009a9306720252a690ceb3a605678735efc871649f7da374ef8aaae
-  data.tar.gz: 61541871026484340ad3ebfa1d714dbb45e9f5bcc98a105113a84379fe41e7ffc83af5e40d6b653e173a78de9370f6cd7a514c50e0012cc3567620f9d33f901e
+  metadata.gz: b26edba3728a8c8dd6476806fb0557ba38de645da4d78919826c5ac53e2d020a2c9b9f506dc1f23c20cfd75e35904890f7fcc7cd180adaa2b1d3d4d33999c92e
+  data.tar.gz: 3bcd6ab6627deaac21c3fd14d98f219e44c1266c85fa053ff7ff9d84d732f1e08831dc717a84b35732fc736f9451d0d70f7570d6242e4824d008230533001262

data/bin/crunch-job

@@ -820,6 +820,9 @@ update_progress_stats();
 THISROUND:
 for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
 {
+  # Don't create new tasks if we already know the job's final result.
+  last if defined($main::success);
+
   my $id = $jobstep_todo[$todo_ptr];
   my $Jobstep = $jobstep[$id];
   if ($Jobstep->{level} != $level)
@@ -1018,7 +1021,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
 	 ||
 	 ($round_num_freeslots > @freeslot && $todo_ptr+1 > $#jobstep_todo))
   {
-    last THISROUND if $main::please_freeze || defined($main::success);
+    last THISROUND if $main::please_freeze;
     if ($main::please_info)
     {
       $main::please_info = 0;
@@ -1695,20 +1698,24 @@ sub log_writer_finish()
 
   close($log_pipe_in);
 
+  my $logger_failed = 0;
   my $read_result = log_writer_read_output(120);
   if ($read_result == -1) {
+    $logger_failed = -1;
     Log (undef, "timed out reading from 'arv-put'");
   } elsif ($read_result != 0) {
+    $logger_failed = -2;
     Log(undef, "failed to read arv-put log manifest to EOF");
   }
 
   waitpid($log_pipe_pid, 0);
   if ($?) {
+    $logger_failed ||= $?;
     Log(undef, "log_writer_finish: arv-put exited " . exit_status_s($?))
   }
 
   close($log_pipe_out);
-  my $arv_put_output = $log_pipe_out_buf;
+  my $arv_put_output = $logger_failed ? undef : $log_pipe_out_buf;
   $log_pipe_pid = $log_pipe_in = $log_pipe_out = $log_pipe_out_buf =
       $log_pipe_out_select = undef;
 
@@ -1774,13 +1781,13 @@ sub save_meta
   my $justcheckpoint = shift; # false if this will be the last meta saved
   return if $justcheckpoint;  # checkpointing is not relevant post-Warehouse.pm
   return unless log_writer_is_active();
+  my $log_manifest = log_writer_finish();
+  return unless defined($log_manifest);
 
-  my $log_manifest = "";
   if ($Job->{log}) {
     my $prev_log_coll = api_call("collections/get", uuid => $Job->{log});
-    $log_manifest .= $prev_log_coll->{manifest_text};
+    $log_manifest = $prev_log_coll->{manifest_text} . $log_manifest;
   }
-  $log_manifest .= log_writer_finish();
 
   my $log_coll = api_call(
     "collections/create", ensure_unique_name => 1, collection => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20151111160124
+  version: 0.1.20151113142812
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-13 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 3cdc4e8e3668b783f42f887f6a8662b66ecb7f9a
+description: Arvados command line tools, git commit 6de60c7db7a98405ef7ae4ac5eb20498f095416c
 email: gem-dev@curoverse.com
 executables:
 - arv