[ARVADOS] updated: 316ff88049af61d37c80002864591aef2bdc1bda

git at public.curoverse.com git at public.curoverse.com
Mon Oct 6 11:40:03 EDT 2014


Summary of changes:
 sdk/cli/bin/crunch-job | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

       via  316ff88049af61d37c80002864591aef2bdc1bda (commit)
      from  7e35706c5532061c6720b64645e491a4cff505ef (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 316ff88049af61d37c80002864591aef2bdc1bda
Author: Brett Smith <brett at curoverse.com>
Date:   Mon Oct 6 11:42:03 2014 -0400

    4012: Bugfix last commit.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 1b56785..dfd482f 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -1551,10 +1551,11 @@ sub retry_op {
   foreach my $try_count (0..$retries) {
     my $next_try = time + (2 ** $try_count);
     my $result = eval { $operation->(@_); };
-    if ($@ && ($try_count < $retries)) {
-      sleep(time - $next_try);
-    } else {
+    if (!$@) {
       return $result;
+    } elsif ($try_count < $retries) {
+      my $sleep_time = time - $next_try;
+      sleep($sleep_time) if ($sleep_time > 0);
     }
   }
   # Ensure the error message ends in a newline, so Perl doesn't add

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list