arvados-cli 0.1.20140811234926 → 0.1.20140812091227

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8aac45278fe5c37fa11f5db1960355f4b540997
-  data.tar.gz: 090d89e060113d99429175cc7baaedcef0307c9e
+  metadata.gz: a54d204bc47cb5d1f271ebff704b547ecc57a113
+  data.tar.gz: bd221ef8fa3fe22c4b23d37013eb2cc1abfdced8
 SHA512:
-  metadata.gz: 837dc3f79e24fb8f30e0d91a81dfb73114d4bdf702d3239bcb0faacfdc156a8b3a1578c7e03b2082550a8a012a388820c5a04d780622b9a8bf7e162bd0f2ddc6
-  data.tar.gz: 0b03f7d519aafc26c65cae9171caa832933ea6d0803fcfb6c696e39e23238143e4345eed1e3c5049ebf3f22f98013fbfefcdf1cc165381ddb71edd573a98a5d7
+  metadata.gz: 3404b992ede6e0accb516fb2ee93c9ace7e2211a83ac20d770317a88b0c46ae019c427fe640de22e1a177ae5bcb0c505a082fa100cc74fedb9d8939cacb4db38
+  data.tar.gz: f9fa9924d67878175f64e8f4c9250d40918c700bd99d7d99c7b5fe18704e111ab1d73d42b745429b8e7a5d2d4c7286d673f9d3965b1874bf6a0d32fa162e185f

data/bin/crunch-job

@@ -84,6 +84,8 @@ use File::Temp;
 use Fcntl ':flock';
 use File::Path qw( make_path );
 
+use constant EX_TEMPFAIL => 75;
+
 $ENV{"TMPDIR"} ||= "/tmp";
 unless (defined $ENV{"CRUNCH_TMP"}) {
   $ENV{"CRUNCH_TMP"} = $ENV{"TMPDIR"} . "/crunch-job";
@@ -151,24 +153,24 @@ if ($job_has_uuid)
   $Job = $arv->{'jobs'}->{'get'}->execute('uuid' => $jobspec);
   if (!$force_unlock) {
     # If some other crunch-job process has grabbed this job (or we see
-    # other evidence that the job is already underway) we exit 111 so
-    # crunch-dispatch (our parent process) doesn't mark the job as
-    # failed.
+    # other evidence that the job is already underway) we exit
+    # EX_TEMPFAIL so crunch-dispatch (our parent process) doesn't
+    # mark the job as failed.
     if ($Job->{'is_locked_by_uuid'}) {
-      Log(undef, "Job is locked by " . $Job->{'is_locked_by_uuid'} . ", exiting 111");
-      exit(111);
+      Log(undef, "Job is locked by " . $Job->{'is_locked_by_uuid'});
+      exit EX_TEMPFAIL;
     }
     if ($Job->{'success'} ne undef) {
       Log(undef, "Job 'success' flag (" . $Job->{'success'} . ") is not null");
-      exit(111);
+      exit EX_TEMPFAIL;
     }
     if ($Job->{'running'}) {
       Log(undef, "Job 'running' flag is already set");
-      exit(111);
+      exit EX_TEMPFAIL;
     }
     if ($Job->{'started_at'}) {
       Log(undef, "Job 'started_at' time is already set (" . $Job->{'started_at'} . ")");
-      exit(111);
+      exit EX_TEMPFAIL;
     }
   }
 }
@@ -281,8 +283,8 @@ if ($job_has_uuid)
   # Claim this job, and make sure nobody else does
   unless ($Job->update_attributes('is_locked_by_uuid' => $User->{'uuid'}) &&
           $Job->{'is_locked_by_uuid'} == $User->{'uuid'}) {
-    Log(undef, "Error while updating / locking job, exiting 111");
-    exit(111);
+    Log(undef, "Error while updating / locking job, exiting ".EX_TEMPFAIL);
+    exit EX_TEMPFAIL;
   }
   $Job->update_attributes('started_at' => scalar gmtime,
                           'running' => 1,
@@ -893,7 +895,7 @@ else {
 Log (undef, "finish");
 
 save_meta();
-exit 0;
+exit ($Job->{'success'} ? 1 : 0);
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140811234926
+  version: 0.1.20140812091227
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -166,7 +166,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: This is the Arvados SDK CLI gem, git revision b349b49b54f5bebc624f4afb981dddea1bfc0d61
+description: This is the Arvados SDK CLI gem, git revision ed1580a38c1aae0910cef83605622a41d927fba3
 email: gem-dev@curoverse.com
 executables:
 - arv