[ARVADOS] updated: 34b16e07d26438d6e7736cfa5a2e0c100e9a67c7

[git at public.curoverse.com]

Summary of changes:
 services/api/script/crunch-dispatch.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

       via  34b16e07d26438d6e7736cfa5a2e0c100e9a67c7 (commit)
      from  6e873d993ddcb2a202013e6d49eda792dac70c21 (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 34b16e07d26438d6e7736cfa5a2e0c100e9a67c7
Author: Brett Smith <brett at curoverse.com>
Date:   Fri Jun 6 13:42:49 2014 -0400

    2880: crunch-dispatch only verifies runtime constraints under SLURM.

diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index e3b3a54..247c0e6 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -170,14 +170,14 @@ class Dispatcher
   def start_jobs
     @todo.each do |job|
       next if @running[job.uuid]
-      nodelist = nodes_available_for_job(job)
-      next if nodelist.nil? or !take(job)
 
       cmd_args = nil
       case Server::Application.config.crunch_job_wrapper
       when :none
         cmd_args = []
       when :slurm_immediate
+        nodelist = nodes_available_for_job(job)
+        next if nodelist.nil?
         cmd_args = ["salloc",
                     "--chdir=/",
                     "--immediate",
@@ -189,6 +189,8 @@ class Dispatcher
         raise "Unknown crunch_job_wrapper: #{Server::Application.config.crunch_job_wrapper}"
       end
 
+      next if !take(job)
+
       if Server::Application.config.crunch_job_user
         cmd_args.unshift("sudo", "-E", "-u",
                          Server::Application.config.crunch_job_user,

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


hooks/post-receive
--