From 2aef6ca08d80c0fd25d74ddb9ab52cf535a33d3e Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 23 Mar 2017 13:23:54 -0400 Subject: [PATCH] 11325: Remove "broken node" check. Assume if the node really isn't functioning, it should be "down" in SLURM anyway. Remove test_broken_node_not_counted because broken node check is removed. --- .../computenode/dispatch/__init__.py | 4 ---- services/nodemanager/tests/test_daemon.py | 21 ------------------- 2 files changed, 25 deletions(-) diff --git a/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py b/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py index fc3ff05777..71f9083c01 100644 --- a/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py +++ b/services/nodemanager/arvnodeman/computenode/dispatch/__init__.py @@ -348,10 +348,6 @@ class ComputeNodeMonitorActor(config.actor_class): if self.arvados_node is None: return 'unpaired' - # This node is indicated as non-functioning by the cloud - if self._cloud.broken(self.cloud_node): - return 'down' - state = self.arvados_node['crunch_worker_state'] # If state information is not available because it is missing or the diff --git a/services/nodemanager/tests/test_daemon.py b/services/nodemanager/tests/test_daemon.py index f1d168c1e6..e49fc39eed 100644 --- a/services/nodemanager/tests/test_daemon.py +++ b/services/nodemanager/tests/test_daemon.py @@ -529,27 +529,6 @@ class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin, self.daemon.node_finished_shutdown(self.last_shutdown).get(self.TIMEOUT) self.assertEqual(0, self.alive_monitor_count()) - def test_broken_node_not_counted(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 - self.cloud_factory().broken.return_value = True - self.daemon.update_server_wishlist([]).get(self.TIMEOUT) - self.daemon.node_can_shutdown(monitor).get(self.TIMEOUT) - self.daemon.node_finished_shutdown(shutdown_proxy()).get(self.TIMEOUT) - 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): size = testutil.MockSize(6) cloud_node = testutil.cloud_node_mock(6, size=size) -- 2.30.2