wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-09-12 12:51:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

[autoscaler] Change the get behavior of node providers' _get_node (#4132)

Browse Source 
* Change the get behavior of GCPNodeProvider._get_node

* Add lock around the GCPNodeProvider._get_node call

* rename nodes

* lint

* Update GCPNodeProvider._get_node to match aws implementation

* assert

* log

* log highest heartbeats

* rename

* bringup to connected

* prune heartbeat times

* fix bringup
This commit is contained in:
Kristian Hartikainen
2019-02-24 18:43:35 -08:00
committed by Eric Liang
parent d9da183c7d
commit 524e69a82d
8 changed files with 82 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ray/autoscaler/gcp/node_provider.py
+12 -5
View File
@@ -53,7 +53,7 @@ class GCPNodeProvider(NodeProvider):
# excessive DescribeInstances requests.
self.cached_nodes = {}
def nodes(self, tag_filters):
def non_terminated_nodes(self, tag_filters):
with self.lock:
if tag_filters:
label_filter_expr = "(" + " AND ".join([
@@ -223,12 +223,19 @@ class GCPNodeProvider(NodeProvider):
return result
def _get_node(self, node_id):
self.nodes({}) # Side effect: fetches and caches the node.
self.non_terminated_nodes({}) # Side effect: updates cache
assert node_id in self.cached_nodes, "Invalid instance id {}".format(
node_id)
with self.lock:
if node_id in self.cached_nodes:
return self.cached_nodes[node_id]
return self.cached_nodes[node_id]
instance = self.compute.instances().get(
project=self.provider_config["project_id"],
zone=self.provider_config["availability_zone"],
instance=node_id,
).execute()
return instance
def _get_cached_node(self, node_id):
if node_id in self.cached_nodes: