[Serve] Start all Serve actors in the "serve" namespace only (ray-p…

…roject#25575)

dashboard/modules/serve/serve_head.py

@@ -36,7 +36,7 @@ async def get_all_deployment_statuses(self, req: Request) -> Response:
         from ray.serve.context import get_global_client
         from ray.serve.schema import serve_status_to_schema
 
-        client = get_global_client(_override_controller_namespace="serve")
+        client = get_global_client()
 
         serve_status_schema = serve_status_to_schema(client.get_serve_status())
         return Response(
@@ -63,7 +63,7 @@ async def put_all_deployments(self, req: Request) -> Response:
         config = ServeApplicationSchema.parse_obj(await req.json())
 
         if config.import_path is not None:
-            client = get_global_client(_override_controller_namespace="serve")
+            client = get_global_client()
             client.deploy_app(config)
         else:
             # TODO (shrekris-anyscale): Remove this conditional path

dashboard/modules/snapshot/tests/test_snapshot.py

@@ -10,6 +10,7 @@
 
 import ray
 from ray import serve
+from ray.serve.constants import SERVE_NAMESPACE
 from ray._private.test_utils import (
     format_web_url,
     run_string_as_driver,
@@ -77,7 +78,7 @@ def ping(self):
 
 @pytest.mark.parametrize("ray_start_with_dashboard", [{"num_cpus": 4}], indirect=True)
 def test_serve_snapshot(ray_start_with_dashboard):
-    """Test detached and nondetached Serve instances running concurrently."""
+    """Test reconnecting to detached Serve application."""
 
     detached_serve_driver_script = f"""
 import ray
@@ -106,16 +107,16 @@ def my_func_deleted(request):
     run_string_as_driver(detached_serve_driver_script)
     assert requests.get("http://127.0.0.1:8000/my_func").text == "hello"
 
-    # Use a new port to avoid clobbering the first Serve instance.
-    serve.start(http_options={"port": 8123})
+    # Connect to the running Serve application with detached=False.
+    serve.start(detached=False)
 
     @serve.deployment(version="v1")
     def my_func_nondetached(request):
         return "hello"
 
     my_func_nondetached.deploy()
 
-    assert requests.get("http://127.0.0.1:8123/my_func_nondetached").text == "hello"
+    assert requests.get("http://127.0.0.1:8000/my_func_nondetached").text == "hello"
 
     webui_url = ray_start_with_dashboard["webui_url"]
     webui_url = format_web_url(webui_url)
@@ -135,7 +136,7 @@ def my_func_nondetached(request):
     ]
     assert entry["name"] == "my_func"
     assert entry["version"] is None
-    assert entry["namespace"] == "serve"
+    assert entry["namespace"] == SERVE_NAMESPACE
     assert entry["httpRoute"] == "/my_func"
     assert entry["className"] == "my_func"
     assert entry["status"] == "RUNNING"
@@ -155,7 +156,7 @@ def my_func_nondetached(request):
     ]
     assert entry_deleted["name"] == "my_func_deleted"
     assert entry_deleted["version"] == "v1"
-    assert entry_deleted["namespace"] == "serve"
+    assert entry_deleted["namespace"] == SERVE_NAMESPACE
     assert entry_deleted["httpRoute"] is None
     assert entry_deleted["className"] == "my_func_deleted"
     assert entry_deleted["status"] == "DELETED"
@@ -168,7 +169,7 @@ def my_func_nondetached(request):
     ]
     assert entry_nondetached["name"] == "my_func_nondetached"
     assert entry_nondetached["version"] == "v1"
-    assert entry_nondetached["namespace"] == "default_test_namespace"
+    assert entry_nondetached["namespace"] == SERVE_NAMESPACE
     assert entry_nondetached["httpRoute"] == "/my_func_nondetached"
     assert entry_nondetached["className"] == "my_func_nondetached"
     assert entry_nondetached["status"] == "RUNNING"

dashboard/optional_utils.py

@@ -270,7 +270,7 @@ async def decorator(self, *args, **kwargs):
                 if connect_to_serve:
                     from ray import serve
 
-                    serve.start(detached=True, _override_controller_namespace="serve")
+                    serve.start(detached=True)
 
                 return await f(self, *args, **kwargs)
             except Exception as e:

doc/source/serve/getting_started.md

@@ -199,7 +199,7 @@ $ ray start --head
 ```
 
 The Ray cluster that this command launches is the same Ray cluster that the
-Python code connects to using `ray.init(address="auto", namespace="serve")`.
+Python code connects to using `ray.init(address="auto")`.
 It is also the same Ray cluster that keeps Ray Serve (and any deployments on
 it, such as `router`) alive even after the Python script exits as long as
 `detached=True` inside `serve.start()`.

java/serve/src/main/java/io/ray/serve/Constants.java

@@ -19,6 +19,8 @@ public class Constants {
 
   public static final String SERVE_CONTROLLER_NAME = "SERVE_CONTROLLER_ACTOR";
 
+  public static final String SERVE_NAMESPACE = "serve";
+
   public static final String CALL_METHOD = "call";
 
   public static final String UTF8 = "UTF-8";

java/serve/src/main/java/io/ray/serve/ProxyActor.java

@@ -50,7 +50,7 @@ public ProxyActor(String controllerName, Map<String, String> config) {
     Serve.setInternalReplicaContext(null, null, controllerName, null);
     Serve.getReplicaContext().setRayServeConfig(new RayServeConfig().setConfig(config));
 
-    Optional<BaseActorHandle> optional = Ray.getActor(controllerName);
+    Optional<BaseActorHandle> optional = Ray.getActor(controllerName, Constants.SERVE_NAMESPACE);
     Preconditions.checkState(optional.isPresent(), "Controller does not exist");
 
     Map<KeyType, KeyListener> keyListeners = new HashMap<>();

java/serve/src/main/java/io/ray/serve/RayServeWrappedReplica.java

@@ -94,7 +94,7 @@ private void init(
       // Get the controller by controllerName.
       Preconditions.checkArgument(
           StringUtils.isNotBlank(controllerName), "Must provide a valid controllerName");
-      Optional<BaseActorHandle> optional = Ray.getActor(controllerName);
+      Optional<BaseActorHandle> optional = Ray.getActor(controllerName, Constants.SERVE_NAMESPACE);
       Preconditions.checkState(optional.isPresent(), "Controller does not exist");
 
       // Enable metrics.

java/serve/src/main/java/io/ray/serve/ReplicaSet.java

@@ -52,7 +52,9 @@ public synchronized void updateWorkerReplicas(Object actorSet) {
     if (!CollectionUtil.isEmpty(actorNames)) {
       actorNames.forEach(
           name ->
-              workerReplicas.add((ActorHandle<RayServeWrappedReplica>) Ray.getActor(name).get()));
+              workerReplicas.add(
+                  (ActorHandle<RayServeWrappedReplica>)
+                      Ray.getActor(name, Constants.SERVE_NAMESPACE).get()));
     }
 
     Set<ActorHandle<RayServeWrappedReplica>> added =

java/serve/src/main/java/io/ray/serve/api/Serve.java

@@ -74,7 +74,7 @@ public static Client connect() {
             ? INTERNAL_REPLICA_CONTEXT.getInternalControllerName()
             : Constants.SERVE_CONTROLLER_NAME;
 
-    Optional<BaseActorHandle> optional = Ray.getActor(controllerName);
+    Optional<BaseActorHandle> optional = Ray.getActor(controllerName, Constants.SERVE_NAMESPACE);
     Preconditions.checkState(
         optional.isPresent(),
         LogUtil.format(

java/serve/src/main/java/io/ray/serve/poll/LongPollClientFactory.java

@@ -101,7 +101,9 @@ public static synchronized void init(BaseActorHandle hostActor) {
 
     LongPollClientFactory.hostActor =
         Optional.ofNullable(hostActor)
-            .orElse(Ray.getActor(replicaContext.getInternalControllerName()).get());
+            .orElse(
+                Ray.getActor(replicaContext.getInternalControllerName(), Constants.SERVE_NAMESPACE)
+                    .get());
 
     scheduledExecutorService =
         Executors.newSingleThreadScheduledExecutor(

java/serve/src/test/java/io/ray/serve/HttpProxyTest.java

@@ -22,6 +22,9 @@ public class HttpProxyTest {
   @Test
   public void test() throws IOException {
     boolean inited = Ray.isInitialized();
+    String previous_namespace = System.getProperty("ray.job.namespace");
+    System.setProperty("ray.job.namespace", Constants.SERVE_NAMESPACE);
+
     Ray.init();
 
     try {
@@ -69,6 +72,11 @@ public void test() throws IOException {
       if (!inited) {
         Ray.shutdown();
       }
+      if (previous_namespace == null) {
+        System.clearProperty("ray.job.namespace");
+      } else {
+        System.setProperty("ray.job.namespace", previous_namespace);
+      }
       Serve.setInternalReplicaContext(null);
       Serve.setGlobalClient(null);
     }

java/serve/src/test/java/io/ray/serve/ProxyActorTest.java

@@ -27,6 +27,8 @@ public class ProxyActorTest {
   @Test
   public void test() throws IOException {
     boolean inited = Ray.isInitialized();
+    String previous_namespace = System.getProperty("ray.job.namespace");
+    System.setProperty("ray.job.namespace", Constants.SERVE_NAMESPACE);
     Ray.init();
 
     try {
@@ -108,6 +110,11 @@ public void test() throws IOException {
       if (!inited) {
         Ray.shutdown();
       }
+      if (previous_namespace == null) {
+        System.clearProperty("ray.job.namespace");
+      } else {
+        System.setProperty("ray.job.namespace", previous_namespace);
+      }
       Serve.setInternalReplicaContext(null);
       Serve.setGlobalClient(null);
     }

java/serve/src/test/java/io/ray/serve/ProxyRouterTest.java

@@ -16,6 +16,8 @@ public class ProxyRouterTest {
   @Test
   public void test() {
     boolean inited = Ray.isInitialized();
+    String previous_namespace = System.getProperty("ray.job.namespace");
+    System.setProperty("ray.job.namespace", Constants.SERVE_NAMESPACE);
     Ray.init();
 
     try {
@@ -63,6 +65,11 @@ public void test() {
       if (!inited) {
         Ray.shutdown();
       }
+      if (previous_namespace == null) {
+        System.clearProperty("ray.job.namespace");
+      } else {
+        System.setProperty("ray.job.namespace", previous_namespace);
+      }
       Serve.setInternalReplicaContext(null);
       Serve.setGlobalClient(null);
     }

java/serve/src/test/java/io/ray/serve/RayServeHandleTest.java

@@ -16,6 +16,8 @@ public class RayServeHandleTest {
   @Test
   public void test() {
     boolean inited = Ray.isInitialized();
+    String previous_namespace = System.getProperty("ray.job.namespace");
+    System.setProperty("ray.job.namespace", Constants.SERVE_NAMESPACE);
     Ray.init();
 
     try {
@@ -77,6 +79,11 @@ public void test() {
       if (!inited) {
         Ray.shutdown();
       }
+      if (previous_namespace == null) {
+        System.clearProperty("ray.job.namespace");
+      } else {
+        System.setProperty("ray.job.namespace", previous_namespace);
+      }
       Serve.setInternalReplicaContext(null);
     }
   }

java/serve/src/test/java/io/ray/serve/RayServeReplicaTest.java

@@ -19,6 +19,8 @@ public class RayServeReplicaTest {
   @Test
   public void test() throws IOException {
     boolean inited = Ray.isInitialized();
+    String previous_namespace = System.getProperty("ray.job.namespace");
+    System.setProperty("ray.job.namespace", Constants.SERVE_NAMESPACE);
     Ray.init();
 
     try {
@@ -107,6 +109,11 @@ public void test() throws IOException {
       if (!inited) {
         Ray.shutdown();
       }
+      if (previous_namespace == null) {
+        System.clearProperty("ray.job.namespace");
+      } else {
+        System.setProperty("ray.job.namespace", previous_namespace);
+      }
       Serve.setInternalReplicaContext(null);
     }
   }

java/serve/src/test/java/io/ray/serve/ReplicaSetTest.java

@@ -32,6 +32,8 @@ public void updateWorkerReplicasTest() {
   @Test
   public void assignReplicaTest() {
     boolean inited = Ray.isInitialized();
+    String previous_namespace = System.getProperty("ray.job.namespace");
+    System.setProperty("ray.job.namespace", Constants.SERVE_NAMESPACE);
     Ray.init();
 
     try {
@@ -88,6 +90,11 @@ public void assignReplicaTest() {
       if (!inited) {
         Ray.shutdown();
       }
+      if (previous_namespace == null) {
+        System.clearProperty("ray.job.namespace");
+      } else {
+        System.setProperty("ray.job.namespace", previous_namespace);
+      }
       Serve.setInternalReplicaContext(null);
     }
   }

java/serve/src/test/java/io/ray/serve/RouterTest.java

@@ -17,6 +17,8 @@ public class RouterTest {
   @Test
   public void test() {
     boolean inited = Ray.isInitialized();
+    String previous_namespace = System.getProperty("ray.job.namespace");
+    System.setProperty("ray.job.namespace", Constants.SERVE_NAMESPACE);
     Ray.init();
 
     try {
@@ -80,6 +82,11 @@ public void test() {
       if (!inited) {
         Ray.shutdown();
       }
+      if (previous_namespace == null) {
+        System.clearProperty("ray.job.namespace");
+      } else {
+        System.setProperty("ray.job.namespace", previous_namespace);
+      }
       Serve.setInternalReplicaContext(null);
     }
   }

java/serve/src/test/java/io/ray/serve/api/ClientTest.java

@@ -19,6 +19,8 @@ public class ClientTest {
   @Test
   public void getHandleTest() {
     boolean inited = Ray.isInitialized();
+    String previous_namespace = System.getProperty("ray.job.namespace");
+    System.setProperty("ray.job.namespace", Constants.SERVE_NAMESPACE);
     Ray.init();
 
     try {
@@ -53,6 +55,11 @@ public void getHandleTest() {
       if (!inited) {
         Ray.shutdown();
       }
+      if (previous_namespace == null) {
+        System.clearProperty("ray.job.namespace");
+      } else {
+        System.setProperty("ray.job.namespace", previous_namespace);
+      }
       Serve.setInternalReplicaContext(null);
     }
   }

java/serve/src/test/java/io/ray/serve/api/ServeTest.java

@@ -38,6 +38,8 @@ public void replicaContextTest() {
   @Test
   public void getGlobalClientTest() {
     boolean inited = Ray.isInitialized();
+    String previous_namespace = System.getProperty("ray.job.namespace");
+    System.setProperty("ray.job.namespace", Constants.SERVE_NAMESPACE);
     Ray.init();
     try {
       Client client = null;
@@ -60,6 +62,11 @@ public void getGlobalClientTest() {
       if (!inited) {
         Ray.shutdown();
       }
+      if (previous_namespace == null) {
+        System.clearProperty("ray.job.namespace");
+      } else {
+        System.setProperty("ray.job.namespace", previous_namespace);
+      }
       Serve.setInternalReplicaContext(null);
       Serve.setGlobalClient(null);
     }

java/serve/src/test/java/io/ray/serve/poll/LongPollClientTest.java

@@ -38,6 +38,8 @@ public void disableTest() throws Throwable {
   @Test
   public void normalTest() throws Throwable {
     boolean inited = Ray.isInitialized();
+    String previous_namespace = System.getProperty("ray.job.namespace");
+    System.setProperty("ray.job.namespace", Constants.SERVE_NAMESPACE);
     Ray.init();
 
     try {
@@ -102,6 +104,11 @@ public void normalTest() throws Throwable {
       if (!inited) {
         Ray.shutdown();
       }
+      if (previous_namespace == null) {
+        System.clearProperty("ray.job.namespace");
+      } else {
+        System.setProperty("ray.job.namespace", previous_namespace);
+      }
       Serve.setInternalReplicaContext(null);
       LongPollClientFactory.stop();
     }