Revert "[Metrics] Fix shared memory is not displayed properly (#34301)"

This reverts commit 688ddf6.
ray-project · Apr 14, 2023 · f246b37 · f246b37
1 parent 0100e64
commit f246b37
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/dashboard/modules/metrics/dashboards/default_dashboard_panels.py b/dashboard/modules/metrics/dashboards/default_dashboard_panels.py
@@ -262,7 +262,7 @@ def max_plus_pending(max_resource, pending_resource):
                 legend="{{Component}}",
             ),
             Target(
-                expr="sum(ray_node_mem_shared_bytes{{{global_filters}}})",
+                expr="node_mem_shared_bytes{{{global_filters}}}",
                 legend="shared_memory",
             ),
             Target(

diff --git a/dashboard/modules/reporter/reporter_agent.py b/dashboard/modules/reporter/reporter_agent.py
@@ -869,7 +869,7 @@ def _record_stats(self, stats, cluster_stats):
         if shm_used:
             node_mem_shared = Record(
                 gauge=METRICS_GAUGES["node_mem_shared_bytes"],
-                value=shm_used,
+                value=mem_total,
                 tags={"ip": ip},
             )
             records_reported.append(node_mem_shared)

diff --git a/dashboard/modules/reporter/tests/test_reporter.py b/dashboard/modules/reporter/tests/test_reporter.py
@@ -168,8 +168,7 @@ def test_case_stats_exist():
                 "ray_node_mem_used" in metric_names,
                 "ray_node_mem_available" in metric_names,
                 "ray_node_mem_total" in metric_names,
-                "ray_node_mem_total" in metric_names,
-                "ray_node_mem_shared_bytes" in metric_names,
+                "ray_component_cpu_percentage" in metric_names,
                 "ray_component_rss_mb" in metric_names,
                 "ray_component_uss_mb" in metric_names,
                 "ray_node_disk_io_read" in metric_names,
@@ -261,10 +260,6 @@ def test_report_stats():
 
     records = agent._record_stats(STATS_TEMPLATE, cluster_stats)
     for record in records:
-        name = record.gauge.name
-        val = record.value
-        if name == "node_mem_shared_bytes":
-            assert val == STATS_TEMPLATE["shm"]
         print(record.gauge.name)
         print(record)
     assert len(records) == 33