[ARVADOS] updated: ed1acd6fd780467ba69998e76e28fda61beedc0f

[Git user]

Summary of changes:
 services/api/app/models/node.rb     | 2 +-
 services/api/lib/crunch_dispatch.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  ed1acd6fd780467ba69998e76e28fda61beedc0f (commit)
      from  d5ddfd9d876a75327795793544d105051f2a306e (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 ed1acd6fd780467ba69998e76e28fda61beedc0f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Feb 16 16:43:06 2017 -0500

    6520: Crunch v1 recognizes 'mix' and 'drng' as busy states for
    consistency (won't affect node manager behavior going forward, however.)

diff --git a/services/api/app/models/node.rb b/services/api/app/models/node.rb
index e0cdda1..affd8ee 100644
--- a/services/api/app/models/node.rb
+++ b/services/api/app/models/node.rb
@@ -47,7 +47,7 @@ class Node < ArvadosModel
   def crunch_worker_state
     return 'down' if slot_number.nil?
     case self.info.andand['slurm_state']
-    when 'alloc', 'comp'
+    when 'alloc', 'comp', 'mix', 'drng'
       'busy'
     when 'idle'
       'idle'
diff --git a/services/api/lib/crunch_dispatch.rb b/services/api/lib/crunch_dispatch.rb
index 1b1df36..18a4250 100644
--- a/services/api/lib/crunch_dispatch.rb
+++ b/services/api/lib/crunch_dispatch.rb
@@ -95,7 +95,7 @@ class CrunchDispatch
       # hasn't been able to communicate with it recently.
       state.sub!(/^idle\*/, "down")
       state.sub!(/\W+$/, "")
-      state = "down" unless %w(idle alloc down).include?(state)
+      state = "down" unless %w(idle alloc comp mix drng down).include?(state)
       slurm_nodes[hostname] = {state: state, job: nil}
     end
     each_slurm_line("squeue", "%j") do |hostname, job_uuid|

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


hooks/post-receive
--