wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-06-28 03:34:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

[autoscaler] Worker-Head termination + Better Scale-up message (#5909)

Browse Source
This commit is contained in:
Richard Liaw
2019-10-14 10:37:50 -07:00
committed by GitHub
parent abbfe7392f
commit 20c0cdee4f
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/autoscaler/aws/node_provider.py
+17 -10
View File
@@ -321,20 +321,27 @@ class AWSNodeProvider(NodeProvider):
def terminate_nodes(self, node_ids):
if not node_ids:
return
node0 = self._get_cached_node(node_ids[0])
if self.cache_stopped_nodes:
if node0.spot_instance_request_id:
logger.info(
"AWSNodeProvider: terminating nodes {} (spot nodes cannot "
"be stopped, only terminated)".format(node_ids))
self.ec2.meta.client.terminate_instances(InstanceIds=node_ids)
else:
spot_ids = []
on_demand_ids = []
for node_id in node_ids:
if self._get_cached_node(node_id).spot_instance_request_id:
spot_ids += [node_id]
else:
on_demand_ids += [node_id]
if on_demand_ids:
logger.info(
"AWSNodeProvider: stopping nodes {}. To terminate nodes "
"on stop, set 'cache_stopped_nodes: False' in the "
"provider config.".format(node_ids))
self.ec2.meta.client.stop_instances(InstanceIds=node_ids)
"provider config.".format(on_demand_ids))
self.ec2.meta.client.stop_instances(InstanceIds=on_demand_ids)
if spot_ids:
logger.info(
"AWSNodeProvider: terminating nodes {} (spot nodes cannot "
"be stopped, only terminated)".format(spot_ids))
self.ec2.meta.client.terminate_instances(InstanceIds=spot_ids)
else:
self.ec2.meta.client.terminate_instances(InstanceIds=node_ids)