Rename

ci/long_running_tests/workloads/serve_failure.py

@@ -38,9 +38,8 @@ def __init__(self, kill_period_s=1):
 
     def _get_all_serve_actors(self):
         master = serve.api._get_controller()
-        [router] = ray.get(master.get_router.remote())
-        [http_proxy] = ray.get(master.get_http_proxy.remote())
-        all_handles = [master, router, http_proxy]
+        routers = ray.get(master.get_router.remote())
+        all_handles = routers + [master]
         worker_handle_dict = ray.get(master.get_all_worker_handles.remote())
         for _, replica_dict in worker_handle_dict.items():
             all_handles.extend(list(replica_dict.values()))

python/ray/serve/api.py

@@ -368,7 +368,7 @@ def get_handle(endpoint_name,
         assert endpoint_name in ray.get(controller.get_all_endpoints.remote())
 
     return RayServeHandle(
-        ray.get(controller.get_http_proxy.remote())[0],
+        ray.get(controller.get_router.remote())[0],
         endpoint_name,
         relative_slo_ms,
         absolute_slo_ms,

python/ray/serve/controller.py

@@ -179,7 +179,7 @@ def _get_or_start_routers(self, host, port):
                     host, port, instance_name=self.instance_name)
             self.routers.append(router)
 
-    def get_http_proxy(self):
+    def get_router(self):
         """Returns a handle to the HTTP proxy managed by this actor."""
         return self.routers
 
@@ -188,7 +188,7 @@ async def broadcast_routers(
         object_refs = [apply(router) for router in self.routers]
         await asyncio.gather(*object_refs)
 
-    def get_http_proxy_config(self):
+    def get_router_config(self):
         """Called by the HTTP proxy on startup to fetch required state."""
         return self.routes
 

python/ray/serve/http_proxy.py

@@ -31,7 +31,7 @@ async def fetch_config_from_controller(self, instance_name=None):
         assert ray.is_initialized()
         controller = serve.api._get_controller()
 
-        self.route_table = await controller.get_http_proxy_config.remote()
+        self.route_table = await controller.get_router_config.remote()
 
         # The exporter is required to return results for /-/metrics endpoint.
         [self.metric_exporter] = await controller.get_metric_exporter.remote()

python/ray/serve/tests/test_failure.py

@@ -75,9 +75,10 @@ def function():
         assert response.text == "hello3"
 
 
-def _kill_http_proxy():
-    [http_proxy] = ray.get(serve.api._get_controller().get_http_proxy.remote())
-    ray.kill(http_proxy, no_restart=False)
+def _kill_routers():
+    routers = ray.get(serve.api._get_controller().get_router.remote())
+    for router in routers:
+        ray.kill(router, no_restart=False)
 
 
 def test_http_proxy_failure(serve_instance):
@@ -96,7 +97,7 @@ def function():
         response = request_with_retries("/proxy_failure", timeout=30)
         assert response.text == "hello1"
 
-    _kill_http_proxy()
+    _kill_routers()
 
     def function():
         return "hello2"