X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ab9a73d2c0b567d3c05d1d4d8463633a69eafda2..7a5eb1b19c698f39b7cfdaafa4b3deefe556b07e:/services/nodemanager/arvnodeman/daemon.py diff --git a/services/nodemanager/arvnodeman/daemon.py b/services/nodemanager/arvnodeman/daemon.py index 5522877bc0..5fc56739b9 100644 --- a/services/nodemanager/arvnodeman/daemon.py +++ b/services/nodemanager/arvnodeman/daemon.py @@ -122,6 +122,7 @@ class NodeManagerDaemonActor(actor_class): self.min_cloud_size = self.server_calculator.cheapest_size() self.min_nodes = min_nodes self.max_nodes = max_nodes + self.node_quota = max_nodes self.max_total_price = max_total_price self.poll_stale_after = poll_stale_after self.boot_fail_after = boot_fail_after @@ -145,8 +146,8 @@ class NodeManagerDaemonActor(actor_class): self.last_polls[poll_key] = time.time() def _pair_nodes(self, node_record, arvados_node): - self._logger.info("Cloud node %s is now paired with Arvados node %s", - node_record.cloud_node.name, arvados_node['uuid']) + self._logger.info("Cloud node %s is now paired with Arvados node %s with hostname %s", + node_record.cloud_node.name, arvados_node['uuid'], arvados_node['hostname']) self._arvados_nodes_actor.subscribe_to( arvados_node['uuid'], node_record.actor.update_arvados_node) node_record.arvados_node = arvados_node @@ -263,6 +264,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): @@ -297,16 +299,17 @@ class NodeManagerDaemonActor(actor_class): def _nodes_wanted(self, size): total_node_count = self._nodes_booting(None) + len(self.cloud_nodes) under_min = self.min_nodes - total_node_count - over_max = total_node_count - self.max_nodes + over_max = total_node_count - self.node_quota total_price = self._total_price() counts = self._state_counts(size) up_count = self._nodes_up(counts) busy_count = counts["busy"] + wishlist_count = self._size_wishlist(size) self._logger.info("%s: wishlist %i, up %i (booting %i, unpaired %i, idle %i, busy %i), down %i, shutdown %i", size.name, - self._size_wishlist(size), + wishlist_count, up_count, counts["booting"], counts["unpaired"], @@ -320,7 +323,7 @@ class NodeManagerDaemonActor(actor_class): elif under_min > 0 and size.id == self.min_cloud_size.id: return under_min - wanted = self._size_wishlist(size) - (up_count - busy_count) + wanted = wishlist_count - (up_count - busy_count) if wanted > 0 and self.max_total_price and ((total_price + (size.price*wanted)) > self.max_total_price): can_boot = int((self.max_total_price - total_price) / size.price) if can_boot == 0: @@ -384,32 +387,55 @@ class NodeManagerDaemonActor(actor_class): arvados_client=self._new_arvados(), arvados_node=arvados_node, cloud_client=self._new_cloud(), - cloud_size=cloud_size).proxy() + cloud_size=self.server_calculator.find_size(cloud_size.id)).proxy() self.booting[new_setup.actor_ref.actor_urn] = new_setup self.sizes_booting[new_setup.actor_ref.actor_urn] = cloud_size if arvados_node is not None: self.arvados_nodes[arvados_node['uuid']].assignment_time = ( time.time()) - new_setup.subscribe(self._later.node_up) + new_setup.subscribe(self._later.node_setup_finished) if nodes_wanted > 1: 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]) - def node_up(self, setup_proxy): + def node_setup_finished(self, setup_proxy): # Called when a SetupActor has completed. - cloud_node, arvados_node = self._get_actor_attrs( - setup_proxy, 'cloud_node', 'arvados_node') + cloud_node, arvados_node, error = self._get_actor_attrs( + setup_proxy, 'cloud_node', 'arvados_node', 'error') setup_proxy.stop() - # If cloud_node is None then the node create wasn't - # successful and so there isn't anything to do. - if cloud_node is not None: + if cloud_node is None: + # If cloud_node is None then the node create wasn't successful. + if error == dispatch.QuotaExceeded: + # We've hit a quota limit, so adjust node_quota to stop trying to + # boot new nodes until the node count goes down. + self.node_quota = len(self.cloud_nodes) + self._logger.warning("After quota exceeded error setting node quota to %s", self.node_quota) + else: # Node creation succeeded. Update cloud node list. cloud_node._nodemanager_recently_booted = True self._register_cloud_node(cloud_node) + + # Different quota policies may in force depending on the cloud + # provider, account limits, and the specific mix of nodes sizes + # that are already created. If we are right at the quota limit, + # we want to probe to see if the last quota still applies or if we + # are allowed to create more nodes. + # + # For example, if the quota is actually based on core count, the + # quota might be 20 single-core machines or 10 dual-core machines. + # If we previously set node_quota to 10 dual core machines, but are + # now booting single core machines (actual quota 20), we want to + # allow the quota to expand so we don't get stuck at 10 machines + # forever. + if len(self.cloud_nodes) >= self.node_quota: + self.node_quota = len(self.cloud_nodes)+1 + self._logger.warning("After successful boot setting node quota to %s", self.node_quota) + + self.node_quota = min(self.node_quota, self.max_nodes) del self.booting[setup_proxy.actor_ref.actor_urn] del self.sizes_booting[setup_proxy.actor_ref.actor_urn] @@ -491,6 +517,16 @@ class NodeManagerDaemonActor(actor_class): def shutdown(self): self._logger.info("Shutting down after signal.") self.poll_stale_after = -1 # Inhibit starting/stopping nodes + + # Shut down pollers + self._server_wishlist_actor.stop() + self._arvados_nodes_actor.stop() + self._cloud_nodes_actor.stop() + + # Clear cloud node list + self.update_cloud_nodes([]) + + # Stop setup actors unless they are in the middle of setup. setup_stops = {key: node.stop_if_no_cloud_node() for key, node in self.booting.iteritems()} self.booting = {key: self.booting[key]