[core][autoscaler] always add Total to ray status section titles (#52458)

in Autoscaler V2

closes #52361

---------

Signed-off-by: David Xia <david@davidxia.com>
Signed-off-by: Rueian <rueiancsie@gmail.com>
Co-authored-by: Rueian <rueiancsie@gmail.com>

Author: davidxia

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/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