X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7b9112dbc270ea338fee756f583bb76870f2e391..f684cda0d2a332f1d2054e7ac8e9de3cb67e23a9:/services/nodemanager/tests/test_daemon.py diff --git a/services/nodemanager/tests/test_daemon.py b/services/nodemanager/tests/test_daemon.py index 31a682ffd8..865191ebad 100644 --- a/services/nodemanager/tests/test_daemon.py +++ b/services/nodemanager/tests/test_daemon.py @@ -9,27 +9,68 @@ import mock import pykka 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 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() + 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) + + mock_actor.proxy.return_value = mock_proxy + self.last_shutdown = mock_proxy + + return mock_actor + def make_daemon(self, cloud_nodes=[], arvados_nodes=[], want_sizes=[], - min_nodes=0, max_nodes=8): + avail_sizes=[(testutil.MockSize(1), {"cores": 1})], + min_nodes=0, max_nodes=8, + shutdown_windows=[54, 5, 1]): 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') self.cloud_factory = mock.MagicMock(name='cloud_mock') self.cloud_factory().node_start_time.return_value = time.time() self.cloud_updates = mock.MagicMock(name='updates_mock') - self.timer = testutil.MockTimer() + self.timer = testutil.MockTimer(deliver_immediately=False) + self.node_setup = mock.MagicMock(name='setup_mock') + 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, self.arv_factory, self.cloud_factory, - [54, 5, 1], min_nodes, max_nodes, 600, 3600, + shutdown_windows, 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) @@ -41,8 +82,24 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, def monitor_list(self): return pykka.ActorRegistry.get_by_class(ComputeNodeMonitorActor) + def monitored_arvados_nodes(self): + pairings = [] + for future in [actor.proxy().arvados_node + for actor in self.monitor_list()]: + try: + pairings.append(future.get(self.TIMEOUT)) + except pykka.ActorDeadError: + pass + return pairings + def alive_monitor_count(self): - return sum(1 for actor in self.monitor_list() if actor.is_alive()) + return len(self.monitored_arvados_nodes()) + + def assertShutdownCancellable(self, expected=True): + self.assertTrue(self.node_shutdown.start.called) + self.assertIs(expected, + self.node_shutdown.start.call_args[1]['cancellable'], + "ComputeNodeShutdownActor incorrectly cancellable") def test_easy_node_creation(self): size = testutil.MockSize(1) @@ -50,15 +107,15 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, self.stop_proxy(self.daemon) self.assertTrue(self.node_setup.start.called) + def check_monitors_arvados_nodes(self, *arv_nodes): + self.assertItemsEqual(arv_nodes, self.monitored_arvados_nodes()) + def test_node_pairing(self): cloud_node = testutil.cloud_node_mock(1) arv_node = testutil.arvados_node_mock(1) self.make_daemon([cloud_node], [arv_node]) self.stop_proxy(self.daemon) - self.assertEqual(1, self.alive_monitor_count()) - self.assertIs( - self.monitor_list()[0].proxy().arvados_node.get(self.TIMEOUT), - arv_node) + self.check_monitors_arvados_nodes(arv_node) def test_node_pairing_after_arvados_update(self): cloud_node = testutil.cloud_node_mock(2) @@ -67,21 +124,26 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, arv_node = testutil.arvados_node_mock(2) self.daemon.update_arvados_nodes([arv_node]).get(self.TIMEOUT) self.stop_proxy(self.daemon) - self.assertEqual(1, self.alive_monitor_count()) - self.assertIs( - self.monitor_list()[0].proxy().arvados_node.get(self.TIMEOUT), - arv_node) + self.check_monitors_arvados_nodes(arv_node) + + def test_arvados_node_un_and_re_paired(self): + # We need to create the Arvados node mock after spinning up the daemon + # to make sure it's new enough to pair with the cloud node. + self.make_daemon([testutil.cloud_node_mock(3)], arvados_nodes=None) + arv_node = testutil.arvados_node_mock(3) + self.daemon.update_arvados_nodes([arv_node]).get(self.TIMEOUT) + self.check_monitors_arvados_nodes(arv_node) + self.daemon.update_cloud_nodes([]).get(self.TIMEOUT) + self.assertEqual(0, self.alive_monitor_count()) + self.daemon.update_cloud_nodes([testutil.cloud_node_mock(3)]) + self.stop_proxy(self.daemon) + self.check_monitors_arvados_nodes(arv_node) 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]) - setup_ref = self.node_setup.start().proxy().actor_ref - setup_ref.actor_urn = 0 - self.node_setup.start.reset_mock() + self.make_daemon(arvados_nodes=[arv_node], avail_sizes=[(size, {"cores":1})]) self.daemon.update_server_wishlist([size]).get(self.TIMEOUT) - self.daemon.max_nodes.get(self.TIMEOUT) - setup_ref.actor_urn += 1 self.daemon.update_server_wishlist([size, size]).get(self.TIMEOUT) self.stop_proxy(self.daemon) used_nodes = [call[1].get('arvados_node') @@ -94,7 +156,61 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, self.make_daemon([testutil.cloud_node_mock()], want_sizes=[testutil.MockSize(1)]) self.stop_proxy(self.daemon) - self.assertFalse(self.node_setup.called) + self.assertFalse(self.node_setup.start.called) + + def test_dont_count_missing_as_busy(self): + size = testutil.MockSize(1) + self.make_daemon(cloud_nodes=[testutil.cloud_node_mock(1), + testutil.cloud_node_mock(2)], + arvados_nodes=[testutil.arvados_node_mock(1), + testutil.arvados_node_mock(2, last_ping_at='1970-01-01T01:02:03.04050607Z')], + want_sizes=[size, size]) + self.stop_proxy(self.daemon) + self.assertTrue(self.node_setup.start.called) + + def test_missing_counts_towards_max(self): + size = testutil.MockSize(1) + self.make_daemon(cloud_nodes=[testutil.cloud_node_mock(1), + testutil.cloud_node_mock(2)], + arvados_nodes=[testutil.arvados_node_mock(1), + testutil.arvados_node_mock(2, last_ping_at='1970-01-01T01:02:03.04050607Z')], + want_sizes=[size, size], + max_nodes=2) + self.stop_proxy(self.daemon) + self.assertFalse(self.node_setup.start.called) + + def test_excess_counts_missing(self): + size = testutil.MockSize(1) + cloud_nodes = [testutil.cloud_node_mock(1), testutil.cloud_node_mock(2)] + self.make_daemon(cloud_nodes=cloud_nodes, + 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.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(1, self.node_shutdown.start.call_count) + + def test_missing_shutdown_not_excess(self): + size = testutil.MockSize(1) + cloud_nodes = [testutil.cloud_node_mock(1), testutil.cloud_node_mock(2)] + self.make_daemon(cloud_nodes=cloud_nodes, + arvados_nodes=[testutil.arvados_node_mock(1), + testutil.arvados_node_mock(2, last_ping_at='1970-01-01T01:02:03.04050607Z')], + want_sizes=[size]) + + 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(1, self.node_shutdown.start.call_count) def test_booting_nodes_counted(self): cloud_node = testutil.cloud_node_mock(1) @@ -108,12 +224,35 @@ 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) + def test_boot_new_node_below_min_nodes(self): + min_size = testutil.MockSize(1) + wish_size = testutil.MockSize(3) + 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) + self.stop_proxy(self.daemon) + self.assertEqual([wish_size, min_size], + [call[1].get('cloud_size') + for call in self.node_setup.start.call_args_list]) + + def test_no_new_node_when_ge_min_nodes_busy(self): + cloud_nodes = [testutil.cloud_node_mock(n) for n in range(1, 4)] + arv_nodes = [testutil.arvados_node_mock(n, job_uuid=True) + for n in range(1, 4)] + self.make_daemon(cloud_nodes, arv_nodes, [], min_nodes=2) + self.stop_proxy(self.daemon) + self.assertEqual(0, self.node_setup.start.call_count) + def test_no_new_node_when_max_nodes_busy(self): self.make_daemon([testutil.cloud_node_mock(3)], [testutil.arvados_node_mock(3, job_uuid=True)], @@ -122,23 +261,31 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, self.stop_proxy(self.daemon) self.assertFalse(self.node_setup.start.called) - def mock_setup_actor(self, cloud_node, arv_node): - setup = self.node_setup.start().proxy() - self.node_setup.reset_mock() - setup.actor_urn = cloud_node.id - setup.cloud_node.get.return_value = cloud_node - setup.arvados_node.get.return_value = arv_node - return setup - def start_node_boot(self, cloud_node=None, arv_node=None, id_num=1): if cloud_node is None: 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) - return self.mock_setup_actor(cloud_node, arv_node) + self.last_setup.cloud_node.get.return_value = cloud_node + self.last_setup.arvados_node.get.return_value = arv_node + return self.last_setup + + def test_no_new_node_when_booted_node_not_usable(self): + cloud_node = testutil.cloud_node_mock(4) + arv_node = testutil.arvados_node_mock(4, crunch_worker_state='down') + setup = self.start_node_boot(cloud_node, arv_node) + self.daemon.node_up(setup).get(self.TIMEOUT) + self.assertEqual(1, self.alive_monitor_count()) + self.daemon.update_cloud_nodes([cloud_node]) + self.daemon.update_arvados_nodes([arv_node]) + self.daemon.update_server_wishlist( + [testutil.MockSize(1)]).get(self.TIMEOUT) + self.stop_proxy(self.daemon) + self.assertEqual(1, self.node_setup.start.call_count) def test_no_duplication_when_booting_node_listed_fast(self): # Test that we don't start two ComputeNodeMonitorActors when @@ -173,8 +320,7 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, self.daemon.update_server_wishlist( [testutil.MockSize(1)]).get(self.TIMEOUT) self.stop_proxy(self.daemon) - self.assertFalse(self.node_setup.start.called, - "daemon did not count booted node toward wishlist") + self.assertEqual(1, self.node_setup.start.call_count) def test_booted_node_can_shutdown(self): setup = self.start_node_boot() @@ -195,8 +341,7 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, monitor = self.monitor_list()[0].proxy() self.daemon.update_server_wishlist([]) self.daemon.node_can_shutdown(monitor).get(self.TIMEOUT) - self.assertTrue(self.node_shutdown.start.called, - "daemon did not shut down booted node on offer") + self.assertShutdownCancellable(True) shutdown = self.node_shutdown.start().proxy() shutdown.cloud_node.get.return_value = cloud_node self.daemon.node_finished_shutdown(shutdown).get(self.TIMEOUT) @@ -210,12 +355,84 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, self.assertTrue(self.node_setup.start.called, "second node not started after booted node stopped") + def test_booted_node_shut_down_when_never_listed(self): + setup = self.start_node_boot() + self.daemon.node_up(setup).get(self.TIMEOUT) + self.assertEqual(1, self.alive_monitor_count()) + self.assertFalse(self.node_shutdown.start.called) + self.timer.deliver() + self.stop_proxy(self.daemon) + self.assertShutdownCancellable(False) + + def test_booted_node_shut_down_when_never_paired(self): + cloud_node = testutil.cloud_node_mock(2) + setup = self.start_node_boot(cloud_node) + self.daemon.node_up(setup).get(self.TIMEOUT) + self.assertEqual(1, self.alive_monitor_count()) + self.daemon.update_cloud_nodes([cloud_node]) + self.timer.deliver() + self.stop_proxy(self.daemon) + self.assertShutdownCancellable(False) + + def test_booted_node_shut_down_when_never_working(self): + cloud_node = testutil.cloud_node_mock(4) + arv_node = testutil.arvados_node_mock(4, crunch_worker_state='down') + setup = self.start_node_boot(cloud_node, arv_node) + self.daemon.node_up(setup).get(self.TIMEOUT) + self.assertEqual(1, self.alive_monitor_count()) + self.daemon.update_cloud_nodes([cloud_node]) + self.daemon.update_arvados_nodes([arv_node]).get(self.TIMEOUT) + self.timer.deliver() + self.stop_proxy(self.daemon) + self.assertShutdownCancellable(False) + + def test_node_that_pairs_not_considered_failed_boot(self): + cloud_node = testutil.cloud_node_mock(3) + arv_node = testutil.arvados_node_mock(3) + setup = self.start_node_boot(cloud_node, arv_node) + self.daemon.node_up(setup).get(self.TIMEOUT) + self.assertEqual(1, self.alive_monitor_count()) + self.daemon.update_cloud_nodes([cloud_node]) + self.daemon.update_arvados_nodes([arv_node]).get(self.TIMEOUT) + self.timer.deliver() + self.stop_proxy(self.daemon) + self.assertFalse(self.node_shutdown.start.called) + + def test_node_that_pairs_busy_not_considered_failed_boot(self): + cloud_node = testutil.cloud_node_mock(5) + arv_node = testutil.arvados_node_mock(5, job_uuid=True) + setup = self.start_node_boot(cloud_node, arv_node) + self.daemon.node_up(setup).get(self.TIMEOUT) + self.assertEqual(1, self.alive_monitor_count()) + self.daemon.update_cloud_nodes([cloud_node]) + self.daemon.update_arvados_nodes([arv_node]).get(self.TIMEOUT) + self.timer.deliver() + self.stop_proxy(self.daemon) + self.assertFalse(self.node_shutdown.start.called) + def test_booting_nodes_shut_down(self): self.make_daemon(want_sizes=[testutil.MockSize(1)]) self.daemon.update_server_wishlist([]).get(self.TIMEOUT) self.stop_proxy(self.daemon) - self.assertTrue( - self.node_setup.start().proxy().stop_if_no_cloud_node.called) + self.assertTrue(self.last_setup.stop_if_no_cloud_node.called) + + def test_all_booting_nodes_tried_to_shut_down(self): + size = testutil.MockSize(2) + 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 + setup1.stop_if_no_cloud_node.reset_mock() + self.daemon.update_server_wishlist([size, size]).get(self.TIMEOUT) + self.daemon.max_nodes.get(self.TIMEOUT) + self.assertIsNot(setup1, self.last_setup) + self.last_setup.stop_if_no_cloud_node().get.return_value = True + self.last_setup.stop_if_no_cloud_node.reset_mock() + self.daemon.update_server_wishlist([]).get(self.TIMEOUT) + self.daemon.max_nodes.get(self.TIMEOUT) + self.stop_proxy(self.daemon) + self.assertEqual(1, self.last_setup.stop_if_no_cloud_node.call_count) + self.assertTrue(setup1.stop_if_no_cloud_node.called) def test_shutdown_declined_at_wishlist_capacity(self): cloud_node = testutil.cloud_node_mock(1) @@ -265,21 +482,43 @@ 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() + self.daemon.node_can_shutdown(monitor).get(self.TIMEOUT) + 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.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): + 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, 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() 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() + shutdown_proxy().cancel_reason.get.return_value = self.node_shutdown.NODE_BROKEN + self.daemon.update_server_wishlist([]).get(self.TIMEOUT) 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.daemon.node_can_shutdown(monitor).get(self.TIMEOUT) - self.assertTrue(shutdown_proxy.called) + self.daemon.update_cloud_nodes([cloud_node]).get(self.TIMEOUT) + self.daemon.update_server_wishlist(wishlist).get(self.TIMEOUT) + self.stop_proxy(self.daemon) + 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) @@ -303,9 +542,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) @@ -313,17 +554,103 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, def test_clean_shutdown_waits_for_node_setup_finish(self): new_node = self.start_node_boot() + new_node.stop_if_no_cloud_node().get.return_value = False + new_node.stop_if_no_cloud_node.reset_mock() self.daemon.shutdown().get(self.TIMEOUT) self.assertTrue(new_node.stop_if_no_cloud_node.called) self.daemon.node_up(new_node).get(self.TIMEOUT) self.assertTrue(new_node.stop.called) + self.timer.deliver() self.assertTrue( self.daemon.actor_ref.actor_stopped.wait(self.TIMEOUT)) def test_wishlist_ignored_after_shutdown(self): - size = testutil.MockSize(2) - self.make_daemon(want_sizes=[size]) + new_node = self.start_node_boot() + new_node.stop_if_no_cloud_node().get.return_value = False + new_node.stop_if_no_cloud_node.reset_mock() self.daemon.shutdown().get(self.TIMEOUT) + size = testutil.MockSize(2) self.daemon.update_server_wishlist([size] * 2).get(self.TIMEOUT) + self.timer.deliver() + self.stop_proxy(self.daemon) + self.assertEqual(1, self.node_setup.start.call_count) + + def test_shutdown_actor_stopped_when_cloud_node_delisted(self): + self.make_daemon(cloud_nodes=[testutil.cloud_node_mock()]) + self.assertEqual(1, self.alive_monitor_count()) + monitor = self.monitor_list()[0].proxy() + self.daemon.node_can_shutdown(monitor).get(self.TIMEOUT) + self.daemon.update_cloud_nodes([]).get(self.TIMEOUT) self.stop_proxy(self.daemon) + self.assertEqual( + 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()]) + self.assertEqual(1, self.alive_monitor_count()) + monitor = self.monitor_list()[0].proxy() + self.daemon.node_can_shutdown(monitor).get(self.TIMEOUT) + # We're mainly testing that update_cloud_nodes catches and handles + # the 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, self.last_shutdown.stop.call_count) + + def test_node_create_two_sizes(self): + small = testutil.MockSize(1) + big = testutil.MockSize(2) + avail_sizes = [(testutil.MockSize(1), {"cores":1}), + (testutil.MockSize(2), {"cores":2})] + self.make_daemon(want_sizes=[small, small, big], + avail_sizes=avail_sizes) + booting = self.daemon.booting.get() + self.stop_proxy(self.daemon) + self.assertEqual(3, self.node_setup.start.call_count) + sizecounts = {a[0].id: 0 for a in avail_sizes} + for b in booting.itervalues(): + sizecounts[b.cloud_size.get().id] += 1 + logging.info(sizecounts) + self.assertEqual(2, sizecounts[small.id]) + self.assertEqual(1, sizecounts[big.id]) + + def test_wishlist_reconfigure(self): + small = testutil.MockSize(1) + big = testutil.MockSize(2) + avail_sizes = [(small, {"cores":1}), (big, {"cores":2})] + + self.make_daemon(cloud_nodes=[testutil.cloud_node_mock(1, small), + testutil.cloud_node_mock(2, small), + testutil.cloud_node_mock(3, big)], + arvados_nodes=[testutil.arvados_node_mock(1), + testutil.arvados_node_mock(2), + testutil.arvados_node_mock(3)], + want_sizes=[small, small, big], + avail_sizes=avail_sizes) + + self.daemon.update_server_wishlist([small, big, big]).get(self.TIMEOUT) + + self.assertEqual(0, self.node_shutdown.start.call_count) + + for c in self.daemon.cloud_nodes.get().nodes.itervalues(): + self.daemon.node_can_shutdown(c.actor) + + booting = self.daemon.booting.get() + shutdowns = self.daemon.shutdowns.get() + + self.stop_proxy(self.daemon) + self.assertEqual(1, self.node_setup.start.call_count) + self.assertEqual(1, self.node_shutdown.start.call_count) + + sizecounts = {a[0].id: 0 for a in avail_sizes} + for b in booting.itervalues(): + sizecounts[b.cloud_size.get().id] += 1 + self.assertEqual(0, sizecounts[small.id]) + self.assertEqual(1, sizecounts[big.id]) + + sizecounts = {a[0].id: 0 for a in avail_sizes} + for b in shutdowns.itervalues(): + sizecounts[b.cloud_node.get().size.id] += 1 + self.assertEqual(1, sizecounts[small.id]) + self.assertEqual(0, sizecounts[big.id])