Test autoscaler fix by williamma12

longshotsyndicate · May 7, 2019 · 61e2026 · 61e2026
1 parent cfe66ef
commit 61e2026
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/python/ray/autoscaler/autoscaler.py b/python/ray/autoscaler/autoscaler.py
@@ -153,7 +153,14 @@ def __init__(self):
 
     def update(self, ip, static_resources, dynamic_resources):
         self.static_resources_by_ip[ip] = static_resources
-        self.dynamic_resources_by_ip[ip] = dynamic_resources
+
+        # TODO(romilb): This is a hotfix to make autoscaler work with #4555
+        dynamic_resources_update = dynamic_resources.copy()
+        for resource_name, capacity in static_resources.items():
+            if resource_name not in dynamic_resources_update:
+                dynamic_resources_update[resource_name] = 0.0
+        self.dynamic_resources_by_ip[ip] = dynamic_resources_update
+
         now = time.time()
         if ip not in self.last_used_time_by_ip or \
                 static_resources != dynamic_resources:

diff --git a/python/ray/monitor.py b/python/ray/monitor.py
@@ -113,7 +113,7 @@ def xray_heartbeat_batch_handler(self, unused_channel, data):
         for j in range(message.BatchLength()):
             heartbeat_message = message.Batch(j)
 
-            num_resources = heartbeat_message.ResourcesAvailableLabelLength()
+            num_resources = heartbeat_message.ResourcesTotalLabelLength()
             static_resources = {}
             dynamic_resources = {}
             for i in range(num_resources):