[ARVADOS] updated: e7876a3ac520b128be7836e30172079ab2af5e45

[Git user]

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

  discards  d8d4344d6865b09ee95e948d23358bd950d9bcbc (commit)
       via  e7876a3ac520b128be7836e30172079ab2af5e45 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (d8d4344d6865b09ee95e948d23358bd950d9bcbc)
            \
             N -- N -- N (e7876a3ac520b128be7836e30172079ab2af5e45)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 e7876a3ac520b128be7836e30172079ab2af5e45
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Apr 10 10:20:31 2017 -0400

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

diff --git a/services/nodemanager/arvnodeman/daemon.py b/services/nodemanager/arvnodeman/daemon.py
index 5522877..9bfee79 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_wish'] = 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..04ff9b6 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_wish', None))
 
     def test_booted_node_lifecycle(self):
         cloud_node = testutil.cloud_node_mock(6)

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


hooks/post-receive
--