Remove RUNFILES_MANIFEST_FILE from the environment when launching subprocesses.

The subprocess (e.g. fleetbench binary) may also need runfiles, and its runfiles path will not be that of the parallel script.

PiperOrigin-RevId: 677869352
Change-Id: If83324bcf51dd76ee8964d26c8f58c256e0d4e41

Author: rjogrady

fleetbench/parallel/BUILD

@@ -42,7 +42,10 @@ py_library(
 py_library(
     name = "benchmark",
     srcs = ["benchmark.py"],
-    deps = ["@com_google_absl_py//absl/flags"],
+    deps = [
+        "@com_google_absl_py//absl/flags",
+        "@com_google_absl_py//absl/logging",
+    ],
 )
 
 py_library(

fleetbench/parallel/benchmark.py

@@ -19,6 +19,8 @@
 import subprocess
 
 from absl import flags
+from absl import logging
+
 
 _BENCHMARK_DIR = flags.DEFINE_string(
     "benchmark_dir",
@@ -27,6 +29,14 @@
 )
 
 
+def CleanEnv() -> dict[str, str]:
+  """Returns a copy of the current environment suitable for subprocesses."""
+  env = os.environ.copy()
+  # Subprocesses don't share the same runfiles as this script.
+  env.pop("RUNFILES_MANIFEST_FILE", None)
+  return env
+
+
 def _FindBenchmarkPath(benchmark: str) -> str:
   """Find the path to the benchmark binary."""
   if os.path.exists(benchmark):
@@ -59,7 +69,13 @@ def GetSubBenchmarks(benchmark_path: str, workload: str = "") -> list[str]:
     cmd += [
         f"--benchmark_filter=BM_{workload.upper()}",
     ]
-  p = subprocess.run(cmd, capture_output=True, text=True, check=True)
+  try:
+    p = subprocess.run(
+        cmd, capture_output=True, text=True, check=True, env=CleanEnv()
+    )
+  except subprocess.CalledProcessError as e:
+    logging.exception("Failed to get sub-benchmarks: %s (%s)", cmd, e.stderr)
+    raise
   return p.stdout.split("\n")[:-1]
 
 

fleetbench/parallel/benchmark_test.py

@@ -144,6 +144,7 @@ def testGetSubBenchmarksWorkloadWithUnmatchedBM(self, mock_run):
         capture_output=True,
         text=True,
         check=True,
+        env=mock.ANY,
     )
 
 

fleetbench/parallel/run.py

@@ -37,7 +37,9 @@ def Execute(self) -> result.Result:
     logging.debug("running %s", command)
     try:
       start = time.time()
-      proc = subprocess.run(command, capture_output=True, check=True, text=True)
+      proc = subprocess.run(
+          command, capture_output=True, check=True, text=True, env=bm.CleanEnv()
+      )
       end = time.time()
     except subprocess.CalledProcessError as e:
       logging.exception("Run failed: %s (%s)", command, e.stderr)