[ARVADOS] updated: d8d4344d6865b09ee95e948d23358bd950d9bcbc

Git user git at public.curoverse.com
Mon Apr 10 10:21:35 EDT 2017


Summary of changes:
 services/nodemanager/arvnodeman/daemon.py | 1 +
 services/nodemanager/tests/test_daemon.py | 1 +
 2 files changed, 2 insertions(+)

       via  d8d4344d6865b09ee95e948d23358bd950d9bcbc (commit)
      from  ab9a73d2c0b567d3c05d1d4d8463633a69eafda2 (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 d8d4344d6865b09ee95e948d23358bd950d9bcbc
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Apr 10 10:20:31 2017 -0400

    11349: Report wishlist size in status["nodes_wanted"].

diff --git a/services/nodemanager/arvnodeman/daemon.py b/services/nodemanager/arvnodeman/daemon.py
index 5522877..39ca71b 100644
--- a/services/nodemanager/arvnodeman/daemon.py
+++ b/services/nodemanager/arvnodeman/daemon.py
@@ -263,6 +263,7 @@ class NodeManagerDaemonActor(actor_class):
         for s in self._node_states(size=None):
             updates.setdefault('nodes_'+s, 0)
             updates['nodes_'+s] += 1
+        updates['nodes_wanted'] = len(self.last_wishlist)
         status.tracker.update(updates)
 
     def _state_counts(self, size):
diff --git a/services/nodemanager/tests/test_daemon.py b/services/nodemanager/tests/test_daemon.py
index 84ede2a..980f577 100644
--- a/services/nodemanager/tests/test_daemon.py
+++ b/services/nodemanager/tests/test_daemon.py
@@ -365,6 +365,7 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
         with test_status.TestServer() as srv:
             self.assertEqual(0, srv.get_status().get('nodes_unpaired', None))
             self.assertEqual(1, srv.get_status().get('nodes_shutdown', None))
+            self.assertEqual(0, srv.get_status().get('nodes_wanted', None))
 
     def test_booted_node_lifecycle(self):
         cloud_node = testutil.cloud_node_mock(6)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list