arvados-cli 0.1.20140811142057 → 0.1.20140811170646

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 439c3f0da9b1889a308b321b4bdf5bda0b34b907
-  data.tar.gz: 4c8ff2c7f16a8e12476d558f4fa0108d7ffa76de
+  metadata.gz: febddc1e5b92663b5edf999c5bbb60e3201b4861
+  data.tar.gz: b46ee559a02d04b8fc01b745eb2aceb9fc0f174e
 SHA512:
-  metadata.gz: 90b10a96a97b29c75d1c21eb5aac9770aa4b01332832e959574585a9d696165c63c17c2e94e88028c96b28e8c30fa6664f49f2c1e5a67005f917f5a59d98243b
-  data.tar.gz: dfd7bd827bdd3230dc55fccfb219d3052eb6412877505fc050f7927b601f28dbd294ea46c6f3781b6bc059e14626d8643e6b095091f6d9d222797073f102f460
+  metadata.gz: 20590e2b98f97db71a56bbfb56aee7c59c3646696777ae6f1a24349355b8406a84e11d52cd7d37dd6b8f600214ddcbb06e0de7bcc769d49728df90657f43df1c
+  data.tar.gz: 696b79fbf54da4265c372e2ef4de49614d3f235b505c02689b47b4740b42dd4176ca21b0b898ab4b39df66a5ea15044d88d8d5b63be1d1fd4a122dd146d571c9

data/bin/crunch-job

@@ -150,17 +150,25 @@ 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.
     if ($Job->{'is_locked_by_uuid'}) {
-      croak("Job is locked: " . $Job->{'is_locked_by_uuid'});
+      Log(undef, "Job is locked by " . $Job->{'is_locked_by_uuid'} . ", exiting 111");
+      exit(111);
     }
     if ($Job->{'success'} ne undef) {
-      croak("Job 'success' flag (" . $Job->{'success'} . ") is not null");
+      Log(undef, "Job 'success' flag (" . $Job->{'success'} . ") is not null");
+      exit(111);
     }
     if ($Job->{'running'}) {
-      croak("Job 'running' flag is already set");
+      Log(undef, "Job 'running' flag is already set");
+      exit(111);
     }
     if ($Job->{'started_at'}) {
-      croak("Job 'started_at' time is already set (" . $Job->{'started_at'} . ")");
+      Log(undef, "Job 'started_at' time is already set (" . $Job->{'started_at'} . ")");
+      exit(111);
     }
   }
 }
@@ -273,7 +281,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'}) {
-    croak("Error while updating / locking job");
+    Log(undef, "Error while updating / locking job, exiting 111");
+    exit(111);
   }
   $Job->update_attributes('started_at' => scalar gmtime,
                           'running' => 1,
@@ -688,7 +697,9 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
 
     my @execargs = ('bash', '-c', $command);
     srun (\@srunargs, \@execargs, undef, $build_script_to_send);
-    exit (111);
+    # exec() failed, we assume nothing happened.
+    Log(undef, "srun() failed on build script");
+    die;
   }
   close("writer");
   if (!defined $childpid)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140811142057
+  version: 0.1.20140811170646
 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 7f4ff745bfd5356e885e13b4984d93c5c5b204f1
+description: This is the Arvados SDK CLI gem, git revision 6c91320c3a53ddbe1b81bee8ed6322c20acbd047
 email: gem-dev@curoverse.com
 executables:
 - arv