[ARVADOS] updated: 8dea5d629b93c1a8201cd347be19fc6f48239622

[git at public.curoverse.com]

Summary of changes:
 services/api/script/crunch-dispatch.rb | 2 +-
 services/api/test/fixtures/nodes.yml   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

       via  8dea5d629b93c1a8201cd347be19fc6f48239622 (commit)
       via  4932c60225740aebd0105a2a0b360b3e5e049629 (commit)
       via  2309c59e0d62a6c904e5600a139d429281e5a0fc (commit)
      from  0477296dadd43b7fff9d8cf282bfa183fca3e138 (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 8dea5d629b93c1a8201cd347be19fc6f48239622
Merge: 0477296 4932c60
Author: Brett Smith <brett at curoverse.com>
Date:   Fri Oct 30 14:47:31 2015 -0400

    Merge branch '7668-crunch-node-properties-wip'
    
    Closes #7668, #7672.


commit 4932c60225740aebd0105a2a0b360b3e5e049629
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Oct 29 12:06:55 2015 -0400

    7668: Move node stats from info to properties in fixtures.

diff --git a/services/api/test/fixtures/nodes.yml b/services/api/test/fixtures/nodes.yml
index 6ca22e1..23d2e19 100644
--- a/services/api/test/fixtures/nodes.yml
+++ b/services/api/test/fixtures/nodes.yml
@@ -38,6 +38,7 @@ idle:
   info:
     ping_secret: "69udawxvn3zzj45hs8bumvndricrha4lcpi23pd69e44soanc0"
     slurm_state: "idle"
+  properties:
     total_cpu_cores: 16
 
 was_idle_now_down:
@@ -53,6 +54,7 @@ was_idle_now_down:
   info:
     ping_secret: "1bd1yi0x4lb5q4gzqqtrnq30oyj08r8dtdimmanbqw49z1anz2"
     slurm_state: "idle"
+  properties:
     total_cpu_cores: 16
 
 new_with_no_hostname:

commit 2309c59e0d62a6c904e5600a139d429281e5a0fc
Author: Brett Smith <brett at curoverse.com>
Date:   Wed Oct 28 11:37:58 2015 -0400

    7668: crunch-dispatch gets node stats from properties field.
    
    This information moved from the info field to the properties field as
    part of #3605.  This simply updates crunch-dispatch to catch up with
    the change.

diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index 4a1fdbc..9fb2566 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -194,7 +194,7 @@ class Dispatcher
     # Otherwise, return nil.
     need_procs = NODE_CONSTRAINT_MAP.each_pair.map do |job_key, node_key|
       Proc.new do |node|
-        positive_int(node.info[node_key], 0) >=
+        positive_int(node.properties[node_key], 0) >=
           positive_int(job.runtime_constraints[job_key], 0)
       end
     end

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


hooks/post-receive
--