[ARVADOS] updated: 19199a75e41004ea776622c305c3ca43e5367bf2

[git at public.curoverse.com]

Summary of changes:
 services/api/lib/crunch_dispatch.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

       via  19199a75e41004ea776622c305c3ca43e5367bf2 (commit)
       via  ddd02b0a536cbc0e80b77df43939e30f294126b5 (commit)
       via  090b515aa10dba597b20a96797f17688f582a529 (commit)
       via  fcbb743e3de63e93280f2fbeedea49f98430d26f (commit)
      from  e8b7fbbd711836c59824327364e15ef2253a5848 (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 19199a75e41004ea776622c305c3ca43e5367bf2
Merge: e8b7fbb ddd02b0
Author: Brett Smith <brett at curoverse.com>
Date:   Tue Feb 9 16:42:59 2016 -0500

    Merge branch '8406-tempfail-after-retry-unlocked'
    
    Closes #8406, #8407.


commit ddd02b0a536cbc0e80b77df43939e30f294126b5
Author: Brett Smith <brett at curoverse.com>
Date:   Tue Feb 9 16:42:12 2016 -0500

    8406: Update comment to match new code.

diff --git a/services/api/lib/crunch_dispatch.rb b/services/api/lib/crunch_dispatch.rb
index 131386d..b59279e 100644
--- a/services/api/lib/crunch_dispatch.rb
+++ b/services/api/lib/crunch_dispatch.rb
@@ -638,8 +638,7 @@ class CrunchDispatch
     jobrecord = Job.find_by_uuid(job_done.uuid)
 
     if exit_status == EXIT_RETRY_UNLOCKED or (exit_tempfail and @job_retry_counts.include? jobrecord.uuid)
-      # The job failed because all of the nodes allocated to it
-      # failed.  Only this crunch-dispatch process can retry the job:
+      # Only this crunch-dispatch process can retry the job:
       # it's already locked, and there's no way to put it back in the
       # Queued state.  Put it in our internal todo list unless the job
       # has failed this way excessively.

commit 090b515aa10dba597b20a96797f17688f582a529
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Feb 9 16:25:45 2016 -0500

    8406: @job_retry_counts.include? jobrecord.uuid because @job_retry_counts has a default value.

diff --git a/services/api/lib/crunch_dispatch.rb b/services/api/lib/crunch_dispatch.rb
index 06a8a4b..131386d 100644
--- a/services/api/lib/crunch_dispatch.rb
+++ b/services/api/lib/crunch_dispatch.rb
@@ -637,7 +637,7 @@ class CrunchDispatch
 
     jobrecord = Job.find_by_uuid(job_done.uuid)
 
-    if exit_status == EXIT_RETRY_UNLOCKED or (exit_tempfail and @job_retry_counts[jobrecord.uuid])
+    if exit_status == EXIT_RETRY_UNLOCKED or (exit_tempfail and @job_retry_counts.include? jobrecord.uuid)
       # The job failed because all of the nodes allocated to it
       # failed.  Only this crunch-dispatch process can retry the job:
       # it's already locked, and there's no way to put it back in the

commit fcbb743e3de63e93280f2fbeedea49f98430d26f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Feb 9 15:53:13 2016 -0500

    8406: Treat EXIT_TEMPFAIL as EXIT_RETRY_UNLOCKED if we have previously gotten
    EXIT_RETRY_UNLOCKED (because the job is now in "Running" state.)

diff --git a/services/api/lib/crunch_dispatch.rb b/services/api/lib/crunch_dispatch.rb
index 05f85c7..06a8a4b 100644
--- a/services/api/lib/crunch_dispatch.rb
+++ b/services/api/lib/crunch_dispatch.rb
@@ -637,7 +637,7 @@ class CrunchDispatch
 
     jobrecord = Job.find_by_uuid(job_done.uuid)
 
-    if exit_status == EXIT_RETRY_UNLOCKED
+    if exit_status == EXIT_RETRY_UNLOCKED or (exit_tempfail and @job_retry_counts[jobrecord.uuid])
       # The job failed because all of the nodes allocated to it
       # failed.  Only this crunch-dispatch process can retry the job:
       # it's already locked, and there's no way to put it back in the

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


hooks/post-receive
--