Disable daemon cgroup assignment in e2e tests

krallin · meta-codesync[bot] · commit fb9dca9c093e · 2026-02-12T16:18:08.000-08:00
Summary: Buck2 e2e tests have garbage data recorded for their local test resource utilization, because the daemon gets assigned a cgroup. As a result things like these massive BXL tests have a low expected resource use: https://www.internalfb.com/sandcastle/job/13510801349671108/ (side note: why are we even using buck2_e2e to check dependencies? Each test gets an isolated daemon loading the whole app, that's crazy expensive? they could probably just use `--reuse-current-config`?? I pinged mzlee to try and find a POC about this) Reviewed By: IanChilds Differential Revision: D93086502 fbshipit-source-id: 413c1a2b4c12f68974acf3b5c4cafc634a774550
diff --git a/app/buck2_resource_control/BUCK b/app/buck2_resource_control/BUCK
@@ -19,6 +19,7 @@ rust_library(
         "fbsource//third-party/rust:tokio-util",
         "//buck2/allocative/allocative:allocative",
         "//buck2/app/buck2_common:buck2_common",
+        "//buck2/app/buck2_core:buck2_core",
         "//buck2/app/buck2_data:buck2_data",
         "//buck2/app/buck2_error:buck2_error",
         "//buck2/app/buck2_events:buck2_events",
diff --git a/app/buck2_resource_control/Cargo.toml b/app/buck2_resource_control/Cargo.toml
@@ -16,6 +16,7 @@ allocative = { workspace = true }
 dupe = { workspace = true }
 
 buck2_common = { workspace = true }
+buck2_core = { workspace = true }
 buck2_data = { workspace = true }
 buck2_error = { workspace = true }
 buck2_events = { workspace = true }
diff --git a/app/buck2_resource_control/src/lib.rs b/app/buck2_resource_control/src/lib.rs
@@ -9,6 +9,7 @@
  */
 
 #![feature(trait_alias)]
+#![feature(used_with_arg)]
 
 use futures::Stream;
 use tokio::sync::mpsc;
diff --git a/app/buck2_resource_control/src/spawn_daemon.rs b/app/buck2_resource_control/src/spawn_daemon.rs
@@ -91,7 +91,14 @@ pub async fn create_daemon_spawn_command(
     working_directory: &AbsNormPath,
 ) -> buck2_error::Result<(std::process::Command, Vec<String>)> {
     let daemon_spawner = {
-        if config.status == ResourceControlStatus::Off {
+        if config.status == ResourceControlStatus::Off
+            || buck2_core::buck2_env!(
+                "BUCK2_TEST_DISABLE_DAEMON_CGROUP",
+                type = bool,
+                applicability = testing,
+            )?
+            .unwrap_or(false)
+        {
             DaemonSpawner::None
         } else {
             match (config.status, get_daemon_spawner(&config.init).await) {
diff --git a/tests/core/help/test_help_env_data/buck2-help-env-testing.golden.txt b/tests/core/help/test_help_env_data/buck2-help-env-testing.golden.txt
@@ -31,6 +31,7 @@ BUCK2_TESTING_INACTIVITY_TIMEOUT        bool                  false
 BUCK2_TEST_BLOCK_ON_UPLOAD              bool                  false
 BUCK2_TEST_BUILD_ERROR                  bool                  false
 BUCK2_TEST_DISABLE_CACHING              bool
+BUCK2_TEST_DISABLE_DAEMON_CGROUP        bool
 BUCK2_TEST_DISABLE_LOG_UPLOAD           bool                  false
 BUCK2_TEST_ERROR_ON_CACHE_UPLOAD        bool                  false
 BUCK2_TEST_EXTRA_EXTERNAL_CONFIG        String
diff --git a/tests/core/resource_control/test_action_suspension.py b/tests/core/resource_control/test_action_suspension.py
@@ -119,7 +119,7 @@ async def _check_suspends(  # noqa C901
     return num_suspended_actions
 
 
-@buck_test(skip_for_os=["darwin", "windows"])
+@buck_test(skip_for_os=["darwin", "windows"], disable_daemon_cgroup=False)
 @env("BUCK2_HARD_ERROR", "panic")
 @pytest.mark.parametrize("kill_and_retry", [True, False])
 async def test_action_suspend(
@@ -155,7 +155,7 @@ async def test_action_suspend(
     assert len(pressure_ends) == 1
 
 
-@buck_test(skip_for_os=["darwin", "windows"])
+@buck_test(skip_for_os=["darwin", "windows"], disable_daemon_cgroup=False)
 @env("BUCK2_HARD_ERROR", "panic")
 @pytest.mark.parametrize("kill_and_retry", [True, False])
 async def test_action_suspend_stress_test(
@@ -170,7 +170,7 @@ async def test_action_suspend_stress_test(
     )
 
 
-@buck_test(skip_for_os=["darwin", "windows"])
+@buck_test(skip_for_os=["darwin", "windows"], disable_daemon_cgroup=False)
 @pytest.mark.parametrize("kill_and_retry", [True, False])
 async def test_suspend_one_of_two(
     buck: Buck,
diff --git a/tests/core/resource_control/test_daemon_memory_metrics.py b/tests/core/resource_control/test_daemon_memory_metrics.py
@@ -15,15 +15,15 @@
 from buck2.tests.e2e_util.buck_workspace import buck_test
 
 
-@buck_test(skip_for_os=["darwin", "windows"])
+@buck_test(skip_for_os=["darwin", "windows"], disable_daemon_cgroup=False)
 async def test_metrics_cgroup_no_resource_control(buck: Buck) -> None:
     write_config(buck, resource_control=False)
     snapshot = await start_daemon_and_get_snapshot(buck)
     assert snapshot["allprocs_cgroup"] is None
     assert snapshot["forkserver_actions_cgroup"] is None
 
 
-@buck_test(skip_for_os=["darwin", "windows"])
+@buck_test(skip_for_os=["darwin", "windows"], disable_daemon_cgroup=False)
 async def test_metrics_cgroup_resource_control(buck: Buck) -> None:
     write_config(buck, resource_control=True)
     snapshot = await start_daemon_and_get_snapshot(buck)
diff --git a/tests/core/resource_control/test_hybrid_execution_resource_control.py b/tests/core/resource_control/test_hybrid_execution_resource_control.py
@@ -31,7 +31,7 @@ def _use_some_memory_args(buck: Buck) -> list[str]:
     ]
 
 
-@buck_test(skip_for_os=["darwin", "windows"])
+@buck_test(skip_for_os=["darwin", "windows"], disable_daemon_cgroup=False)
 async def test_memory_pressure_telemetry(
     buck: Buck,
 ) -> None:
@@ -62,7 +62,7 @@ async def test_memory_pressure_telemetry(
     )
 
 
-@buck_test(skip_for_os=["darwin", "windows"])
+@buck_test(skip_for_os=["darwin", "windows"], disable_daemon_cgroup=False)
 async def test_resource_control_events_created(
     buck: Buck,
 ) -> None:
@@ -112,7 +112,7 @@ def get_daemon_cgroup_path(pid: int) -> Path:
     raise Exception(f"Could not find cgroup v2 entry for PID {pid}")
 
 
-@buck_test(skip_for_os=["darwin", "windows"])
+@buck_test(skip_for_os=["darwin", "windows"], disable_daemon_cgroup=False)
 async def test_daemon_id_in_cgroup_path(buck: Buck) -> None:
     await buck.server()
 
diff --git a/tests/core/resource_control/test_instruction_count.py b/tests/core/resource_control/test_instruction_count.py
@@ -24,7 +24,7 @@ def helper_bin_flags() -> List[str]:
     ]
 
 
-@buck_test(skip_for_os=["windows", "darwin"])
+@buck_test(skip_for_os=["windows", "darwin"], disable_daemon_cgroup=False)
 async def test_instruction_count_disabled(buck: Buck) -> None:
     await buck.build(
         "root//:three_billion_instructions",
@@ -67,7 +67,7 @@ async def get_matching_details(buck: Buck) -> Dict[str, Any]:
     raise AssertionError("did not find the expected target")
 
 
-@buck_test(skip_for_os=["windows", "darwin"])
+@buck_test(skip_for_os=["windows", "darwin"], disable_daemon_cgroup=False)
 async def test_instruction_count_enabled(buck: Buck) -> None:
     await buck.build(
         "root//:three_billion_instructions",
@@ -90,7 +90,7 @@ async def test_instruction_count_enabled(buck: Buck) -> None:
     assert instruction_count < 3300000000
 
 
-@buck_test(skip_for_os=["windows", "darwin"])
+@buck_test(skip_for_os=["windows", "darwin"], disable_daemon_cgroup=False)
 async def test_instruction_count_remote(buck: Buck) -> None:
     await buck.build(
         "root//:three_billion_instructions",
diff --git a/tests/core/resource_control/test_memory_reporting.py b/tests/core/resource_control/test_memory_reporting.py
@@ -29,7 +29,7 @@ def _use_some_memory_args(buck: Buck) -> list[str]:
     ]
 
 
-@buck_test(skip_for_os=["windows", "darwin"])
+@buck_test(skip_for_os=["windows", "darwin"], disable_daemon_cgroup=False)
 async def test_memory_reporting_disabled(buck: Buck) -> None:
     env = {"BUCK2_TEST_RESOURCE_CONTROL_CONFIG": '{"status":"Off"}'}
 
@@ -68,7 +68,7 @@ async def get_matching_details(buck: Buck) -> Dict[str, Any]:
     raise AssertionError("did not find the expected target")
 
 
-@buck_test(skip_for_os=["windows", "darwin"])
+@buck_test(skip_for_os=["windows", "darwin"], disable_daemon_cgroup=False)
 async def test_memory_reporting(buck: Buck) -> None:
     await buck.build(
         *_use_some_memory_args(buck),
@@ -82,7 +82,7 @@ async def test_memory_reporting(buck: Buck) -> None:
     assert memory_peak < 15000000
 
 
-@buck_test(skip_for_os=["windows", "darwin"])
+@buck_test(skip_for_os=["windows", "darwin"], disable_daemon_cgroup=False)
 async def test_memory_reporting_in_test(buck: Buck) -> None:
     await buck.test(
         *_use_some_memory_args(buck),
diff --git a/tests/e2e_util/buck_workspace.py b/tests/e2e_util/buck_workspace.py
@@ -46,6 +46,7 @@
         "extra_buck_config",
         "skip_final_kill",
         "setup_eden",
+        "disable_daemon_cgroup",
     ],
 )
 
@@ -88,6 +89,9 @@ async def buck_fixture(  # noqa C901 : "too complex"
     env["BUCK2_IGNORE_VERSION_EXTRACTION_FAILURE"] = "true"
     env["SUPERCONSOLE_TESTING_WIDTH"] = "100"
     env["SUPERCONSOLE_TESTING_HEIGHT"] = "100"
+    # Don't try to assign to a new cgroup during tests.
+    if marker.disable_daemon_cgroup:
+        env["BUCK2_TEST_DISABLE_DAEMON_CGROUP"] = "true"
 
     assert "BUCK2_RUNTIME_THREADS" in env, (
         "BUCK2_RUNTIME_THREADS should be set by the test macros"
@@ -476,6 +480,7 @@ def buck_test(
     extra_buck_config: Optional[Dict[str, Dict[str, str]]] = None,
     skip_final_kill=False,
     setup_eden=False,
+    disable_daemon_cgroup=True,
 ) -> Callable:
     """
     Defines a buck test. This is a must have decorator on all test case functions.
@@ -542,6 +547,7 @@ def buck_test(
             extra_buck_config=extra_buck_config or {},
             skip_final_kill=skip_final_kill,
             setup_eden=setup_eden,
+            disable_daemon_cgroup=disable_daemon_cgroup,
         )
     )
 
