[ARVADOS] created: 1ad098e2521d57ba6d66d0a0d9dfffab76061924
git at public.curoverse.com
git at public.curoverse.com
Fri Nov 6 16:25:04 EST 2015
at 1ad098e2521d57ba6d66d0a0d9dfffab76061924 (commit)
commit 1ad098e2521d57ba6d66d0a0d9dfffab76061924
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri Nov 6 16:24:55 2015 -0500
5353: Existing tests pass now. (Still need to add a few tests that explicitly
test multiple node sizes.)
diff --git a/services/nodemanager/arvnodeman/daemon.py b/services/nodemanager/arvnodeman/daemon.py
index 9502542..f4cd456 100644
--- a/services/nodemanager/arvnodeman/daemon.py
+++ b/services/nodemanager/arvnodeman/daemon.py
@@ -216,7 +216,7 @@ class NodeManagerDaemonActor(actor_class):
up = 0
up += sum(1
for c in self.booting.itervalues()
- if size is None or c.cloud_node.get().size.id == size.id)
+ if size is None or c.cloud_size.get().id == size.id)
up += sum(1
for i in (self.booted, self.cloud_nodes.nodes)
for c in i.itervalues()
@@ -256,8 +256,6 @@ class NodeManagerDaemonActor(actor_class):
up_count = self._nodes_up(size) - (self._size_shutdowns(size) +
self._nodes_busy(size) +
self._nodes_missing(size))
- #self._logger.info("_nodes_up for %s is %s", size.id, self._nodes_up(size))
- #self._logger.info("counts %s %s %s", len(self.booting), len(self.booted), len(self.cloud_nodes))
return self._size_wishlist(size) - up_count
def _nodes_excess(self, size):
diff --git a/services/nodemanager/tests/test_daemon.py b/services/nodemanager/tests/test_daemon.py
index 6b80d9d..c1f3b3a 100644
--- a/services/nodemanager/tests/test_daemon.py
+++ b/services/nodemanager/tests/test_daemon.py
@@ -16,17 +16,35 @@ import logging
class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
unittest.TestCase):
- def new_setup(self, **kwargs):
+ def mock_node_start(self, **kwargs):
# Make sure that every time the daemon starts a setup actor,
# it gets a new mock object back.
+ get_cloud_size = mock.MagicMock()
+ get_cloud_size.get.return_value = kwargs["cloud_size"]
+ mock_actor = mock.MagicMock()
+ mock_proxy = mock.NonCallableMock(name='setup_mock_proxy',
+ cloud_size=get_cloud_size,
+ actor_ref=mock_actor)
+ mock_actor.proxy.return_value = mock_proxy
+
+ self.last_setup = mock_proxy
+ return mock_actor
+
+ def mock_node_shutdown(self, **kwargs):
+ # Make sure that every time the daemon starts a shutdown actor,
+ # it gets a new mock object back.
get_cloud_node = mock.MagicMock()
- get_cloud_node.get.return_value = mock.NonCallableMock(size=kwargs["cloud_size"])
+ if "node_monitor" in kwargs:
+ get_cloud_node.get.return_value = kwargs["node_monitor"].proxy().cloud_node.get()
+ mock_actor = mock.MagicMock()
+ mock_proxy = mock.NonCallableMock(name='shutdown_mock_proxy',
+ cloud_node=get_cloud_node,
+ actor_ref=mock_actor)
- self.last_setup = mock.NonCallableMock(name='setup_mock',
- cloud_node=get_cloud_node)
- self.last_setup.proxy = mock.MagicMock(return_value = self.last_setup)
+ mock_actor.proxy.return_value = mock_proxy
+ self.last_shutdown = mock_proxy
- return self.last_setup
+ return mock_actor
def make_daemon(self, cloud_nodes=[], arvados_nodes=[], want_sizes=[],
avail_sizes=[(testutil.MockSize(1), {"cores": 1})], min_nodes=0, max_nodes=8):
@@ -39,9 +57,12 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
self.timer = testutil.MockTimer(deliver_immediately=False)
self.node_setup = mock.MagicMock(name='setup_mock')
- self.node_setup.start.side_effect = self.new_setup
+ self.node_setup.start.side_effect = self.mock_node_start
self.node_setup.reset_mock()
+
self.node_shutdown = mock.MagicMock(name='shutdown_mock')
+ self.node_shutdown.start.side_effect = self.mock_node_shutdown
+
self.daemon = nmdaemon.NodeManagerDaemonActor.start(
self.server_wishlist_poller, self.arvados_nodes_poller,
self.cloud_nodes_poller, self.cloud_updates, self.timer,
@@ -119,7 +140,7 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
def test_old_arvados_node_not_double_assigned(self):
arv_node = testutil.arvados_node_mock(3, age=9000)
size = testutil.MockSize(3)
- self.make_daemon(arvados_nodes=[arv_node])
+ self.make_daemon(arvados_nodes=[arv_node], avail_sizes=[(size, {"cores":1})])
self.daemon.update_server_wishlist([size]).get(self.TIMEOUT)
self.daemon.update_server_wishlist([size, size]).get(self.TIMEOUT)
self.stop_proxy(self.daemon)
@@ -175,11 +196,19 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
arvados_nodes=[testutil.arvados_node_mock(1),
testutil.arvados_node_mock(2, last_ping_at='1970-01-01T01:02:03.04050607Z')],
want_sizes=[size])
- self.daemon.shutdowns.get()[cloud_nodes[1].id] = mock.MagicMock(name='shutdown_proxy_mock')
+
+ get_cloud_node = mock.MagicMock(name="get_cloud_node")
+ get_cloud_node.get.return_value = cloud_nodes[1]
+ mock_node_monitor = mock.MagicMock()
+ mock_node_monitor.proxy.return_value = mock.NonCallableMock(cloud_node=get_cloud_node)
+ mock_shutdown = self.node_shutdown.start(node_monitor=mock_node_monitor)
+
+ self.daemon.shutdowns.get()[cloud_nodes[1].id] = mock_shutdown.proxy()
+
self.assertEqual(2, self.alive_monitor_count())
for mon_ref in self.monitor_list():
self.daemon.node_can_shutdown(mon_ref.proxy()).get(self.TIMEOUT)
- self.assertEqual(0, self.node_shutdown.start.call_count)
+ self.assertEqual(1, self.node_shutdown.start.call_count)
def test_booting_nodes_counted(self):
cloud_node = testutil.cloud_node_mock(1)
@@ -193,9 +222,10 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
self.assertEqual(1, self.node_setup.start.call_count)
def test_boot_new_node_when_all_nodes_busy(self):
+ size = testutil.MockSize(2)
arv_node = testutil.arvados_node_mock(2, job_uuid=True)
- self.make_daemon([testutil.cloud_node_mock(2)], [arv_node],
- [testutil.MockSize(2)])
+ self.make_daemon([testutil.cloud_node_mock(2, size=size)], [arv_node],
+ [size], avail_sizes=[(size, {"cores":1})])
self.stop_proxy(self.daemon)
self.assertTrue(self.node_setup.start.called)
@@ -234,7 +264,8 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
cloud_node = testutil.cloud_node_mock(id_num)
if arv_node is None:
arv_node = testutil.arvados_node_mock(id_num)
- self.make_daemon(want_sizes=[testutil.MockSize(id_num)])
+ self.make_daemon(want_sizes=[testutil.MockSize(id_num)],
+ avail_sizes=[(testutil.MockSize(id_num), {"cores":1})])
self.daemon.max_nodes.get(self.TIMEOUT)
self.assertEqual(1, self.node_setup.start.call_count)
self.last_setup.cloud_node.get.return_value = cloud_node
@@ -385,7 +416,7 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
def test_all_booting_nodes_tried_to_shut_down(self):
size = testutil.MockSize(2)
- self.make_daemon(want_sizes=[size])
+ self.make_daemon(want_sizes=[size], avail_sizes=[(size, {"cores":1})])
self.daemon.max_nodes.get(self.TIMEOUT)
setup1 = self.last_setup
setup1.stop_if_no_cloud_node().get.return_value = False
@@ -449,23 +480,23 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
self.make_daemon([cloud_node], [testutil.arvados_node_mock(5)])
self.assertEqual(1, self.alive_monitor_count())
monitor = self.monitor_list()[0].proxy()
- shutdown_proxy = self.node_shutdown.start().proxy
- shutdown_proxy().cloud_node.get.return_value = cloud_node
- shutdown_proxy().success.get.return_value = False
- shutdown_proxy.reset_mock()
self.daemon.node_can_shutdown(monitor).get(self.TIMEOUT)
- self.assertTrue(shutdown_proxy.called)
- self.daemon.node_finished_shutdown(shutdown_proxy()).get(self.TIMEOUT)
- shutdown_proxy().success.get.return_value = True
- shutdown_proxy.reset_mock()
+ self.last_shutdown.success.get.return_value = False
+ self.daemon.node_finished_shutdown(self.last_shutdown).get(self.TIMEOUT)
+ self.assertEqual(1, self.alive_monitor_count())
+
self.daemon.node_can_shutdown(monitor).get(self.TIMEOUT)
- self.assertTrue(shutdown_proxy.called)
+ self.last_shutdown.success.get.return_value = True
+ self.last_shutdown.stop.side_effect = lambda: monitor.stop()
+ self.daemon.node_finished_shutdown(self.last_shutdown).get(self.TIMEOUT)
+ self.assertEqual(0, self.alive_monitor_count())
def test_broken_node_blackholed_after_cancelled_shutdown(self):
- cloud_node = testutil.cloud_node_mock(8)
- wishlist = [testutil.MockSize(8)]
+ size = testutil.MockSize(8)
+ cloud_node = testutil.cloud_node_mock(8, size=size)
+ wishlist = [size]
self.make_daemon([cloud_node], [testutil.arvados_node_mock(8)],
- wishlist)
+ wishlist, avail_sizes=[(size, {"cores":1})])
self.assertEqual(1, self.alive_monitor_count())
self.assertFalse(self.node_setup.start.called)
monitor = self.monitor_list()[0].proxy()
@@ -482,8 +513,10 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
self.assertEqual(1, self.node_setup.start.call_count)
def test_nodes_shutting_down_replaced_below_max_nodes(self):
- cloud_node = testutil.cloud_node_mock(6)
- self.make_daemon([cloud_node], [testutil.arvados_node_mock(6)])
+ size = testutil.MockSize(6)
+ cloud_node = testutil.cloud_node_mock(6, size=size)
+ self.make_daemon([cloud_node], [testutil.arvados_node_mock(6)],
+ avail_sizes=[(size, {"cores":1})])
self.assertEqual(1, self.alive_monitor_count())
monitor = self.monitor_list()[0].proxy()
self.daemon.node_can_shutdown(monitor).get(self.TIMEOUT)
@@ -507,9 +540,11 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
self.assertFalse(self.node_setup.start.called)
def test_nodes_shutting_down_count_against_excess(self):
- cloud_nodes = [testutil.cloud_node_mock(n) for n in [8, 9]]
- arv_nodes = [testutil.arvados_node_mock(n) for n in [8, 9]]
- self.make_daemon(cloud_nodes, arv_nodes, [testutil.MockSize(8)])
+ size = testutil.MockSize(8)
+ cloud_nodes = [testutil.cloud_node_mock(n, size=size) for n in [8, 9]]
+ arv_nodes = [testutil.arvados_node_mock(n, size=size) for n in [8, 9]]
+ self.make_daemon(cloud_nodes, arv_nodes, [size],
+ avail_sizes=[(size, {"cores":1})])
self.assertEqual(2, self.alive_monitor_count())
for mon_ref in self.monitor_list():
self.daemon.node_can_shutdown(mon_ref.proxy()).get(self.TIMEOUT)
@@ -546,7 +581,7 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
self.daemon.update_cloud_nodes([]).get(self.TIMEOUT)
self.stop_proxy(self.daemon)
self.assertEqual(
- 1, self.node_shutdown.start().proxy().stop().get.call_count)
+ 1, self.last_shutdown.stop.call_count)
def test_shutdown_actor_cleanup_copes_with_dead_actors(self):
self.make_daemon(cloud_nodes=[testutil.cloud_node_mock()])
@@ -555,8 +590,7 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
self.daemon.node_can_shutdown(monitor).get(self.TIMEOUT)
# We're mainly testing that update_cloud_nodes catches and handles
# the ActorDeadError.
- stop_method = self.node_shutdown.start().proxy().stop().get
- stop_method.side_effect = pykka.ActorDeadError
+ self.last_shutdown.stop.side_effect = pykka.ActorDeadError
self.daemon.update_cloud_nodes([]).get(self.TIMEOUT)
self.stop_proxy(self.daemon)
- self.assertEqual(1, stop_method.call_count)
+ self.assertEqual(1, self.last_shutdown.stop.call_count)
commit 80d30b6a1662e03d56d33f7b29a211d0b3413e2c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Fri Nov 6 12:02:03 2015 -0500
5353: Parameterize the following methods on node size: _nodes_up, _nodes_busy,
_nodes_missing, _nodes_wanted, _nodes_excess, start_node, and stop_booting_node.
Start fixing tests.
diff --git a/services/nodemanager/arvnodeman/daemon.py b/services/nodemanager/arvnodeman/daemon.py
index 65fddd2..9502542 100644
--- a/services/nodemanager/arvnodeman/daemon.py
+++ b/services/nodemanager/arvnodeman/daemon.py
@@ -212,51 +212,70 @@ class NodeManagerDaemonActor(actor_class):
self._pair_nodes(cloud_rec, arv_node)
break
- def _nodes_up(self):
- return sum(len(nodelist) for nodelist in
- [self.cloud_nodes, self.booted, self.booting])
-
- def _nodes_busy(self):
+ def _nodes_up(self, size):
+ up = 0
+ up += sum(1
+ for c in self.booting.itervalues()
+ if size is None or c.cloud_node.get().size.id == size.id)
+ up += sum(1
+ for i in (self.booted, self.cloud_nodes.nodes)
+ for c in i.itervalues()
+ if size is None or c.cloud_node.size.id == size.id)
+ return up
+
+ def _nodes_busy(self, size):
return sum(1 for busy in
pykka.get_all(rec.actor.in_state('busy') for rec in
- self.cloud_nodes.nodes.itervalues())
+ self.cloud_nodes.nodes.itervalues()
+ if rec.cloud_node.size.id == size.id)
if busy)
- def _nodes_missing(self):
+ def _nodes_missing(self, size):
return sum(1 for arv_node in
pykka.get_all(rec.actor.arvados_node for rec in
self.cloud_nodes.nodes.itervalues()
- if rec.actor.cloud_node.get().id not in self.shutdowns)
+ if rec.cloud_node.size.id == size.id and rec.actor.cloud_node.get().id not in self.shutdowns)
if arv_node and cnode.arvados_node_missing(arv_node, self.node_stale_after))
- def _nodes_wanted(self):
- up_count = self._nodes_up()
- under_min = self.min_nodes - up_count
- over_max = up_count - self.max_nodes
+ def _size_wishlist(self, size):
+ return sum(1 for c in self.last_wishlist if c.id == size.id)
+
+ def _size_shutdowns(self, size):
+ return sum(1 for c in self.shutdowns.itervalues()
+ if c.cloud_node.get().size.id == size.id)
+
+ def _nodes_wanted(self, size):
+ total_up_count = self._nodes_up(None)
+ under_min = self.min_nodes - total_up_count
+ over_max = total_up_count - self.max_nodes
if over_max >= 0:
return -over_max
- elif under_min > 0:
+ elif under_min > 0 and size.id == self.min_cloud_size.id:
return under_min
else:
- up_count -= len(self.shutdowns) + self._nodes_busy() + self._nodes_missing()
- return len(self.last_wishlist) - up_count
-
- def _nodes_excess(self):
- up_count = self._nodes_up() - len(self.shutdowns)
- over_min = up_count - self.min_nodes
- if over_min <= 0:
- return over_min
- else:
- return up_count - self._nodes_busy() - len(self.last_wishlist)
+ up_count = self._nodes_up(size) - (self._size_shutdowns(size) +
+ self._nodes_busy(size) +
+ self._nodes_missing(size))
+ #self._logger.info("_nodes_up for %s is %s", size.id, self._nodes_up(size))
+ #self._logger.info("counts %s %s %s", len(self.booting), len(self.booted), len(self.cloud_nodes))
+ return self._size_wishlist(size) - up_count
+
+ def _nodes_excess(self, size):
+ up_count = self._nodes_up(size) - self._size_shutdowns(size)
+ if size.id == self.min_cloud_size.id:
+ up_count -= self.min_nodes
+ return up_count - self._nodes_busy(size) - self._size_wishlist(size)
def update_server_wishlist(self, wishlist):
self._update_poll_time('server_wishlist')
self.last_wishlist = wishlist
- nodes_wanted = self._nodes_wanted()
- if nodes_wanted > 0:
- self._later.start_node()
- elif (nodes_wanted < 0) and self.booting:
- self._later.stop_booting_node()
+ for sz in reversed(self.server_calculator.cloud_sizes):
+ size = sz.real
+ nodes_wanted = self._nodes_wanted(size)
+ if nodes_wanted > 0:
+ self._later.start_node(size)
+ elif (nodes_wanted < 0) and self.booting:
+ self._later.stop_booting_node(size)
def _check_poll_freshness(orig_func):
"""Decorator to inhibit a method when poll information is stale.
@@ -276,15 +295,11 @@ class NodeManagerDaemonActor(actor_class):
return wrapper
@_check_poll_freshness
- def start_node(self):
- nodes_wanted = self._nodes_wanted()
+ def start_node(self, cloud_size):
+ nodes_wanted = self._nodes_wanted(cloud_size)
if nodes_wanted < 1:
return None
arvados_node = self.arvados_nodes.find_stale_node(self.node_stale_after)
- try:
- cloud_size = self.last_wishlist[self._nodes_up()]
- except IndexError:
- cloud_size = self.min_cloud_size
self._logger.info("Want %s more nodes. Booting a %s node.",
nodes_wanted, cloud_size.name)
new_setup = self._node_setup.start(
@@ -299,7 +314,7 @@ class NodeManagerDaemonActor(actor_class):
time.time())
new_setup.subscribe(self._later.node_up)
if nodes_wanted > 1:
- self._later.start_node()
+ self._later.start_node(cloud_size)
def _get_actor_attrs(self, actor, *attr_names):
return pykka.get_all([getattr(actor, name) for name in attr_names])
@@ -316,15 +331,15 @@ class NodeManagerDaemonActor(actor_class):
self._later.shutdown_unpaired_node, cloud_node.id)
@_check_poll_freshness
- def stop_booting_node(self):
- nodes_excess = self._nodes_excess()
+ def stop_booting_node(self, size):
+ nodes_excess = self._nodes_excess(size)
if (nodes_excess < 1) or not self.booting:
return None
for key, node in self.booting.iteritems():
- if node.stop_if_no_cloud_node().get():
+ if node.cloud_size.get().id == size.id and node.stop_if_no_cloud_node().get():
del self.booting[key]
if nodes_excess > 1:
- self._later.stop_booting_node()
+ self._later.stop_booting_node(size)
break
def _begin_node_shutdown(self, node_actor, cancellable):
@@ -340,7 +355,7 @@ class NodeManagerDaemonActor(actor_class):
@_check_poll_freshness
def node_can_shutdown(self, node_actor):
- if self._nodes_excess() > 0:
+ if self._nodes_excess(node_actor.cloud_node.get().size) > 0:
self._begin_node_shutdown(node_actor, cancellable=True)
def shutdown_unpaired_node(self, cloud_node_id):
diff --git a/services/nodemanager/arvnodeman/jobqueue.py b/services/nodemanager/arvnodeman/jobqueue.py
index 06f66b7..ebe79fd 100644
--- a/services/nodemanager/arvnodeman/jobqueue.py
+++ b/services/nodemanager/arvnodeman/jobqueue.py
@@ -83,6 +83,12 @@ class ServerCalculator(object):
def cheapest_size(self):
return self.cloud_sizes[0]
+ def find_size(self, sz):
+ for s in self.cloud_sizes:
+ if s.id == sz.id:
+ return s
+ return None
+
class JobQueueMonitorActor(clientactor.RemotePollLoopActor):
"""Actor to generate server wishlists from the job queue.
diff --git a/services/nodemanager/tests/test_daemon.py b/services/nodemanager/tests/test_daemon.py
index 6f7f478..6b80d9d 100644
--- a/services/nodemanager/tests/test_daemon.py
+++ b/services/nodemanager/tests/test_daemon.py
@@ -12,13 +12,20 @@ import arvnodeman.daemon as nmdaemon
from arvnodeman.jobqueue import ServerCalculator
from arvnodeman.computenode.dispatch import ComputeNodeMonitorActor
from . import testutil
+import logging
class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
unittest.TestCase):
- def new_setup_proxy(self):
+ def new_setup(self, **kwargs):
# Make sure that every time the daemon starts a setup actor,
# it gets a new mock object back.
- self.last_setup = mock.MagicMock(name='setup_proxy_mock')
+ get_cloud_node = mock.MagicMock()
+ get_cloud_node.get.return_value = mock.NonCallableMock(size=kwargs["cloud_size"])
+
+ self.last_setup = mock.NonCallableMock(name='setup_mock',
+ cloud_node=get_cloud_node)
+ self.last_setup.proxy = mock.MagicMock(return_value = self.last_setup)
+
return self.last_setup
def make_daemon(self, cloud_nodes=[], arvados_nodes=[], want_sizes=[],
@@ -30,8 +37,9 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
self.cloud_factory().node_start_time.return_value = time.time()
self.cloud_updates = mock.MagicMock(name='updates_mock')
self.timer = testutil.MockTimer(deliver_immediately=False)
+
self.node_setup = mock.MagicMock(name='setup_mock')
- self.node_setup.start().proxy.side_effect = self.new_setup_proxy
+ self.node_setup.start.side_effect = self.new_setup
self.node_setup.reset_mock()
self.node_shutdown = mock.MagicMock(name='shutdown_mock')
self.daemon = nmdaemon.NodeManagerDaemonActor.start(
@@ -167,7 +175,7 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
arvados_nodes=[testutil.arvados_node_mock(1),
testutil.arvados_node_mock(2, last_ping_at='1970-01-01T01:02:03.04050607Z')],
want_sizes=[size])
- self.daemon.shutdowns.get()[cloud_nodes[1].id] = True
+ self.daemon.shutdowns.get()[cloud_nodes[1].id] = mock.MagicMock(name='shutdown_proxy_mock')
self.assertEqual(2, self.alive_monitor_count())
for mon_ref in self.monitor_list():
self.daemon.node_can_shutdown(mon_ref.proxy()).get(self.TIMEOUT)
@@ -194,7 +202,9 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
def test_boot_new_node_below_min_nodes(self):
min_size = testutil.MockSize(1)
wish_size = testutil.MockSize(3)
- self.make_daemon([], [], None, min_size=min_size, min_nodes=2)
+ avail_sizes = [(min_size, {"cores": 1}),
+ (wish_size, {"cores": 3})]
+ self.make_daemon([], [], None, avail_sizes=avail_sizes, min_nodes=2)
self.daemon.update_server_wishlist([wish_size]).get(self.TIMEOUT)
self.daemon.update_cloud_nodes([]).get(self.TIMEOUT)
self.daemon.update_server_wishlist([wish_size]).get(self.TIMEOUT)
diff --git a/services/nodemanager/tests/testutil.py b/services/nodemanager/tests/testutil.py
index 82d6479..aeb9768 100644
--- a/services/nodemanager/tests/testutil.py
+++ b/services/nodemanager/tests/testutil.py
@@ -44,17 +44,6 @@ def cloud_object_mock(name_id, **extra):
cloud_object.extra = extra
return cloud_object
-def cloud_node_mock(node_num=99, **extra):
- node = mock.NonCallableMagicMock(
- ['id', 'name', 'state', 'public_ips', 'private_ips', 'driver', 'size',
- 'image', 'extra'],
- name='cloud_node')
- node.id = str(node_num)
- node.name = node.id
- node.public_ips = []
- node.private_ips = [ip_address_mock(node_num)]
- node.extra = extra
- return node
def cloud_node_fqdn(node):
# We intentionally put the FQDN somewhere goofy to make sure tested code is
@@ -148,3 +137,16 @@ class RemotePollLoopActorTestMixin(ActorTestMixin):
self.subscriber = mock.Mock(name='subscriber_mock')
self.monitor = self.TEST_CLASS.start(
self.client, self.timer, *args, **kwargs).proxy()
+
+def cloud_node_mock(node_num=99, size=MockSize(1), **extra):
+ node = mock.NonCallableMagicMock(
+ ['id', 'name', 'state', 'public_ips', 'private_ips', 'driver', 'size',
+ 'image', 'extra'],
+ name='cloud_node')
+ node.id = str(node_num)
+ node.name = node.id
+ node.size = size
+ node.public_ips = []
+ node.private_ips = [ip_address_mock(node_num)]
+ node.extra = extra
+ return node
commit 6c8cf507184707e1529ef98ffd98269835a39243
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Thu Nov 5 11:40:59 2015 -0800
5353: Give NodeManagerDaemonActor access to ServerCalculator object.
diff --git a/services/nodemanager/arvnodeman/daemon.py b/services/nodemanager/arvnodeman/daemon.py
index a65e9a0..65fddd2 100644
--- a/services/nodemanager/arvnodeman/daemon.py
+++ b/services/nodemanager/arvnodeman/daemon.py
@@ -103,7 +103,8 @@ class NodeManagerDaemonActor(actor_class):
def __init__(self, server_wishlist_actor, arvados_nodes_actor,
cloud_nodes_actor, cloud_update_actor, timer_actor,
arvados_factory, cloud_factory,
- shutdown_windows, min_size, min_nodes, max_nodes,
+ shutdown_windows, server_calculator,
+ min_nodes, max_nodes,
poll_stale_after=600,
boot_fail_after=1800,
node_stale_after=7200,
@@ -122,7 +123,8 @@ class NodeManagerDaemonActor(actor_class):
self._logger = logging.getLogger('arvnodeman.daemon')
self._later = self.actor_ref.proxy()
self.shutdown_windows = shutdown_windows
- self.min_cloud_size = min_size
+ self.server_calculator = server_calculator
+ self.min_cloud_size = self.server_calculator.cheapest_size()
self.min_nodes = min_nodes
self.max_nodes = max_nodes
self.poll_stale_after = poll_stale_after
diff --git a/services/nodemanager/arvnodeman/launcher.py b/services/nodemanager/arvnodeman/launcher.py
index 8801582..5dfdb1d 100644
--- a/services/nodemanager/arvnodeman/launcher.py
+++ b/services/nodemanager/arvnodeman/launcher.py
@@ -114,7 +114,7 @@ def main(args=None):
cloud_node_updater, timer,
config.new_arvados_client, config.new_cloud_client,
config.shutdown_windows(),
- server_calculator.cheapest_size(),
+ server_calculator,
config.getint('Daemon', 'min_nodes'),
config.getint('Daemon', 'max_nodes'),
config.getint('Daemon', 'poll_stale_after'),
diff --git a/services/nodemanager/tests/test_daemon.py b/services/nodemanager/tests/test_daemon.py
index bbfbe4b..6f7f478 100644
--- a/services/nodemanager/tests/test_daemon.py
+++ b/services/nodemanager/tests/test_daemon.py
@@ -9,6 +9,7 @@ import mock
import pykka
import arvnodeman.daemon as nmdaemon
+from arvnodeman.jobqueue import ServerCalculator
from arvnodeman.computenode.dispatch import ComputeNodeMonitorActor
from . import testutil
@@ -21,7 +22,7 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
return self.last_setup
def make_daemon(self, cloud_nodes=[], arvados_nodes=[], want_sizes=[],
- min_size=testutil.MockSize(1), min_nodes=0, max_nodes=8):
+ avail_sizes=[(testutil.MockSize(1), {"cores": 1})], min_nodes=0, max_nodes=8):
for name in ['cloud_nodes', 'arvados_nodes', 'server_wishlist']:
setattr(self, name + '_poller', mock.MagicMock(name=name + '_mock'))
self.arv_factory = mock.MagicMock(name='arvados_mock')
@@ -37,7 +38,8 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
self.server_wishlist_poller, self.arvados_nodes_poller,
self.cloud_nodes_poller, self.cloud_updates, self.timer,
self.arv_factory, self.cloud_factory,
- [54, 5, 1], min_size, min_nodes, max_nodes, 600, 1800, 3600,
+ [54, 5, 1], ServerCalculator(avail_sizes),
+ min_nodes, max_nodes, 600, 1800, 3600,
self.node_setup, self.node_shutdown).proxy()
if cloud_nodes is not None:
self.daemon.update_cloud_nodes(cloud_nodes).get(self.TIMEOUT)
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list