update

python/ray/autoscaler/_private/node_launcher.py

@@ -63,8 +63,9 @@ def __init__(
 
  def launch_node(self, config: Dict[str, Any], count: int, node_type: str):
  self.log("Got {} nodes to launch.".format(count))
- self._launch_node(config, count, node_type)
+ created_nodes = self._launch_node(config, count, node_type)
  self.pending.dec(node_type, count)
+ return created_nodes
 
  def _launch_node(self, config: Dict[str, Any], count: int, node_type: str):
  if self.node_types:
@@ -100,8 +101,9 @@ def _launch_node(self, config: Dict[str, Any], count: int, node_type: str):
 
  error_msg = None
  full_exception = None
+ created_nodes = {}
  try:
- self.provider.create_node_with_resources(
+ created_nodes = self.provider.create_node_with_resources(
  node_config, node_tags, count, resources
  )
  except NodeLaunchException as node_launch_exception:
@@ -158,6 +160,8 @@ def _launch_node(self, config: Dict[str, Any], count: int, node_type: str):
  if full_exception is not None:
  self.log(full_exception)
 
+ return created_nodes
+
  def log(self, statement):
  # launcher_class is "BaseNodeLauncher", or "NodeLauncher" if called
  # from that subclass.

python/ray/autoscaler/v2/instance_manager/node_provider.py

@@ -82,17 +82,17 @@ def _filter_instances(
 
  @override
  def create_nodes(self, instance_type: InstanceType, count: int) -> List[Instance]:
- result = self._node_launcher.launch_node(
+ created_nodes = self._node_launcher.launch_node(
  self._config.get_raw_config_mutable(),
  count,
  instance_type.name,
  )
  # TODO: we should handle failures where the instance type is
  # not available
- if result:
+ if created_nodes:
  return [
  self._get_instance(cloud_instance_id)
- for cloud_instance_id in result.keys()
+ for cloud_instance_id in created_nodes.keys()
  ]
  return []
 
@@ -107,7 +107,7 @@ def is_readonly(self) -> bool:
  @override
  def get_non_terminated_nodes(self):
  clould_instance_ids = self._provider.non_terminated_nodes()
- return self.get_nodes_by_id(clould_instance_ids)
+ return self.get_nodes_by_cloud_id(clould_instance_ids)
 
  @override
  def get_nodes_by_cloud_id(