Merge branch 'master' into SERVE-657-update-naming

Author: ok-scale

python/ray/_private/test_utils.py

@@ -1714,6 +1714,7 @@ def check_local_files_gced(cluster, whitelist=None):
             if whitelist and set(items).issubset(whitelist):
                 continue
             if len(items) > 0:
+                print(f"runtime_env files not GC'd from subdir '{subdir}': {items}")
                 return False
     return True
 

python/ray/autoscaler/_private/util.py

@@ -940,11 +940,11 @@ def format_info_string(
 
 Resources
 {separator}
-{"Total " if verbose else ""}Usage:
+Total Usage:
 {usage_report}
-{"Total " if verbose else ""}Constraints:
+Total Constraints:
 {constraints_report}
-{"Total " if verbose else ""}Demands:
+Total Demands:
 {demand_report}"""
 
     if verbose:

python/ray/autoscaler/v2/utils.py

@@ -344,11 +344,11 @@ def format(cls, data: ClusterStatus, verbose: bool = False) -> str:
             "",
             "Resources",
             separator,
-            f"{'Total ' if verbose else ''}Usage:",
+            "Total Usage:",
             cluster_usage_report,
-            f"{'Total ' if verbose else ''}Constraints:",
+            "Total Constraints:",
             constraints_report,
-            f"{'Total ' if verbose else ''}Demands:",
+            "Total Demands:",
             demand_report,
             node_usage_report,
         ]

python/ray/dashboard/client/src/pages/overview/OverviewPage.component.test.tsx

@@ -3,12 +3,22 @@ import React, { PropsWithChildren } from "react";
 import { MemoryRouter } from "react-router-dom";
 import { GlobalContext } from "../../App";
 import { STYLE_WRAPPER } from "../../util/test-utils";
+import { useRayStatus } from "../job/hook/useClusterStatus";
 import { useJobList } from "../job/hook/useJobList";
 import { OverviewPage } from "./OverviewPage";
 
 jest.mock("../job/hook/useJobList");
+jest.mock("../job/hook/useClusterStatus");
+
+const mockedUseRayStatus = jest.mocked(useRayStatus);
 
 describe("OverviewPage", () => {
+  beforeEach(() => {
+    mockedUseRayStatus.mockReturnValue({
+      clusterStatus: undefined,
+    });
+  });
+
   it("renders", async () => {
     expect.assertions(3);
 

python/ray/tests/test_autoscaler_e2e.py

@@ -123,11 +123,7 @@ def ping(self):
     actor = Actor.remote()
     ray.get(actor.ping.remote())
 
-    assert "Demands" in subprocess.check_output("ray status", shell=True).decode()
-    assert (
-        "Total Demands"
-        not in subprocess.check_output("ray status", shell=True).decode()
-    )
+    assert "Total Demands" in subprocess.check_output("ray status", shell=True).decode()
     assert (
         "Total Demands" in subprocess.check_output("ray status -v", shell=True).decode()
     )

python/ray/tests/test_cli_patterns/test_ray_status.txt

@@ -12,12 +12,12 @@ Recent failures:
 
 Resources
 ---------------------------------------------------------------
-Usage:
+Total Usage:
  0.0/3.0 CPU
  0.+
  0.+
 
-Constraints:
+Total Constraints:
  \(no request_resources\(\) constraints\)
-Demands:
+Total Demands:
  \(no resource demands\)

python/ray/tests/test_cli_patterns/test_ray_status_multinode.txt

@@ -15,12 +15,12 @@ Recent failures:
 
 Resources
 ---------------------------------------------------------------
-Usage:
+Total Usage:
  0.0/8.0 CPU
  0.+
  0.+
 
-Constraints:
+Total Constraints:
  \(no request_resources\(\) constraints\)
-Demands:
+Total Demands:
  \(no resource demands\)

python/ray/tests/test_cli_patterns/test_ray_status_multinode_v1.txt

@@ -13,12 +13,12 @@ Recent failures:
 
 Resources
 ---------------------------------------------------------------
-Usage:
+Total Usage:
  0.0/8.0 CPU
  0.+
  0.+
 
-Constraints:
+Total Constraints:
  \(no request_resources\(\) constraints\)
-Demands:
+Total Demands:
  \(no resource demands\)

python/ray/tests/test_cli_patterns/test_ray_status_v1.txt

@@ -10,12 +10,12 @@ Recent failures:
 
 Resources
 ---------------------------------------------------------------
-Usage:
+Total Usage:
  0.0/3.0 CPU
  0.+
  0.+
 
-Constraints:
+Total Constraints:
  \(no request_resources\(\) constraints\)
-Demands:
+Total Demands:
  \(no resource demands\)

python/ray/tests/test_resource_demand_scheduler.py

@@ -3159,16 +3159,16 @@ def test_info_string():
 
 Resources
 --------------------------------------------------------
-Usage:
+Total Usage:
  0/2 AcceleratorType:V100
  530.0/544.0 CPU
  2/2 GPU
  2.00GiB/8.00GiB memory
  3.14GiB/16.00GiB object_store_memory
 
-Constraints:
+Total Constraints:
  {'CPU': 16}: 100 from request_resources()
-Demands:
+Total Demands:
  {'CPU': 1}: 150+ pending tasks/actors
  {'CPU': 4} * 5 (PACK): 420+ pending placement groups
 """.strip()
@@ -3217,16 +3217,16 @@ def test_info_string_multiple_constraints():
 
 Resources
 --------------------------------------------------------
-Usage:
+Total Usage:
  530.0/544.0 CPU
  2/2 GPU
  2.00GiB/8.00GiB memory
  3.14GiB/16.00GiB object_store_memory
 
-Constraints:
+Total Constraints:
  {'CPU': 16}: 100 from request_resources()
  {'CPU': 1, 'GPU': 16}: 10 from request_resources()
-Demands:
+Total Demands:
  {'CPU': 1}: 150+ pending tasks/actors
  {'CPU': 4} * 5 (PACK): 420+ pending placement groups
 """.strip()
@@ -3610,16 +3610,16 @@ def test_info_string_with_launch_failures():
 
 Resources
 --------------------------------------------------------
-Usage:
+Total Usage:
  0/2 AcceleratorType:V100
  530.0/544.0 CPU
  2/2 GPU
  2.00GiB/8.00GiB memory
  3.14GiB/16.00GiB object_store_memory
 
-Constraints:
+Total Constraints:
  {'CPU': 16}: 100 from request_resources()
-Demands:
+Total Demands:
  {'CPU': 1}: 150+ pending tasks/actors
  {'CPU': 4} * 5 (PACK): 420+ pending placement groups
 """.strip()
@@ -3792,16 +3792,16 @@ def test_info_string_failed_node_cap():
 
 Resources
 --------------------------------------------------------
-Usage:
+Total Usage:
  0/2 AcceleratorType:V100
  530.0/544.0 CPU (2.0 used of 2.0 reserved in placement groups)
  2/2 GPU
  2.00GiB/8.00GiB memory
  3.14GiB/16.00GiB object_store_memory
 
-Constraints:
+Total Constraints:
  {'CPU': 16}: 100 from request_resources()
-Demands:
+Total Demands:
  {'CPU': 2.0}: 153+ pending tasks/actors (3+ using placement groups)
  {'GPU': 0.5}: 100+ pending tasks/actors (100+ using placement groups)
  {'CPU': 4} * 5 (PACK): 420+ pending placement groups

python/ray/tests/test_runtime_env_conda_and_pip_3.py

@@ -1,7 +1,6 @@
 import os
 import pytest
 import sys
-import time
 
 from ray._private.test_utils import (
     wait_for_condition,
@@ -10,7 +9,6 @@
 )
 import ray
 
-from unittest import mock
 
 if not os.environ.get("CI"):
     # This flags turns on the local development that link against current ray
@@ -145,48 +143,6 @@ def test_import(self):
             assert not check_local_files_gced(cluster)
 
 
-# Set scope to "class" to force this to run before start_cluster, whose scope
-# is "function".  We need these env vars to be set before Ray is started.
-@pytest.fixture(scope="class")
-def skip_local_gc():
-    with mock.patch.dict(
-        os.environ,
-        {
-            "RAY_RUNTIME_ENV_SKIP_LOCAL_GC": "1",
-        },
-    ):
-        print("RAY_RUNTIME_ENV_SKIP_LOCAL_GC enabled.")
-        yield
-
-
-class TestSkipLocalGC:
-    @pytest.mark.skipif(
-        os.environ.get("CI") and sys.platform != "linux",
-        reason="Requires PR wheels built in CI, so only run on linux CI machines.",
-    )
-    @pytest.mark.parametrize("field", ["conda", "pip"])
-    def test_skip_local_gc_env_var(self, skip_local_gc, start_cluster, field, tmp_path):
-        cluster, address = start_cluster
-        runtime_env = generate_runtime_env_dict(field, "python_object", tmp_path)
-        ray.init(address, namespace="test", runtime_env=runtime_env)
-
-        @ray.remote
-        def f():
-            import pip_install_test  # noqa: F401
-
-            return True
-
-        assert ray.get(f.remote())
-
-        ray.shutdown()
-
-        # Give enough time for potentially uninstalling a conda env
-        time.sleep(10)
-
-        # Check nothing was GC'ed
-        assert not check_local_files_gced(cluster)
-
-
 if __name__ == "__main__":
     if os.environ.get("PARALLEL_CI"):
         sys.exit(pytest.main(["-n", "auto", "--boxed", "-vs", __file__]))