arvados-cli 0.1.20140918150213 → 0.1.20140918172435

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab821f42bbad7c21cdf28deef6e702339b5770c2
-  data.tar.gz: 97ec2be1d4fba0bf43a2204e4731f092a5013d00
+  metadata.gz: 8b87723cda131e6b36e4bf46037e1a5ebd82f36e
+  data.tar.gz: f813ecf3d2481f485a8dcbddb9ec78c73ee2b1cd
 SHA512:
-  metadata.gz: 8738ac5628f747c60c490a034d8507c8bd05fff514563da605bb23a9e32334ec647ca783432bb5f72779761af7e1bf9507b7a6de1f2ce08214be89a734000e69
-  data.tar.gz: 2340416a537dab6625652cc653cd1eef4d719614fb68ef73b6fbabdf9f6cf56b898b9227476c7d73b6faded3a96d10db454161c23331ebda5306e26075c64c3f
+  metadata.gz: a7122c2526c10f88ef8e914f49b44629823a17e4a367fc6a64153ef603e6ca135651da4cc8fc0abbcd6b7cd6ec461e47869fb4dc53f51c66dc971628b631b2d8
+  data.tar.gz: 4d94e5a61edae9fa18d844e3064b4e02f127c4766fa30f19b716e7f0f75c8da325ad260dd1c9d29d8233812b0d549e84eaad861f4cac551d924b5f95dda44f99

data/bin/crunch-job

@@ -1207,7 +1207,8 @@ sub collate_output
   Log (undef, "collate");
 
   my ($child_out, $child_in);
-  my $pid = open2($child_out, $child_in, 'arv-put', '--raw');
+  my $pid = open2($child_out, $child_in, 'arv-put', '--raw',
+                  '--retries', put_retry_count());
   my $joboutput;
   for (@jobstep)
   {
@@ -1347,8 +1348,9 @@ sub save_meta
   return if $justcheckpoint;  # checkpointing is not relevant post-Warehouse.pm
 
   $local_logfile->flush;
-  my $cmd = "arv-put --portable-data-hash --filename ''\Q$keep_logfile\E "
-      . quotemeta($local_logfile->filename);
+  my $retry_count = put_retry_count();
+  my $cmd = "arv-put --portable-data-hash --retries $retry_count " .
+      "--filename ''\Q$keep_logfile\E " . quotemeta($local_logfile->filename);
   my $loglocator = `$cmd`;
   die "system $cmd failed: $?" if $?;
   chomp($loglocator);
@@ -1494,6 +1496,20 @@ sub find_docker_image {
   }
 }
 
+sub put_retry_count {
+  # Calculate a --retries argument for arv-put that will have it try
+  # approximately as long as this Job has been running.
+  my $stoptime = shift || time;
+  my $starttime = $jobstep[0]->{starttime};
+  my $timediff = defined($starttime) ? ($stoptime - $starttime) : 1;
+  my $retries = 0;
+  while ($timediff >= 2) {
+    $retries++;
+    $timediff /= 2;
+  }
+  return ($retries > 3) ? $retries : 3;
+}
+
 __DATA__
 #!/usr/bin/perl
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140918150213
+  version: 0.1.20140918172435
 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 58ccc8f13d66fc3da1aecb392a6698a29958e203
+description: This is the Arvados SDK CLI gem, git revision 9d724d2028cc942b02f5a3846fc25d46761ce136
 email: gem-dev@curoverse.com
 executables:
 - arv