[ARVADOS] created: b19b2bc95a30eed13f4cc5b155c14d862e39e503

[git at public.curoverse.com]

        at  b19b2bc95a30eed13f4cc5b155c14d862e39e503 (commit)


commit b19b2bc95a30eed13f4cc5b155c14d862e39e503
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Nov 6 16:51:40 2014 -0500

    4314: Don't expire the token if the job is still in queued state.

diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index b3ab9bf..5d9323a 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -616,8 +616,11 @@ class Dispatcher
       # fine.
     end
 
-    # Invalidate the per-job auth token
-    j_done[:job_auth].update_attributes expires_at: Time.now
+    # Invalidate the per-job auth token, unless the job is still queued and we
+    # might want to try it again.
+    if jobrecord.state != "Queued"
+      j_done[:job_auth].update_attributes expires_at: Time.now
+    end
 
     @running.delete job_done.uuid
   end

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


hooks/post-receive
--