From a1d8fa99616a079b586a751d545b6881085714fe Mon Sep 17 00:00:00 2001 From: Kousik Kumar Date: Fri, 18 Mar 2022 02:50:31 -0400 Subject: [PATCH] Do not dump metrics if reproxy was never started Dumping of RBE metrics should only happen when reproxy was started. Reproxy is started only when Soong is run in make / build mode and not in dumpvars mode. Doc: https://docs.google.com/document/d/1Iqhu5QgozB_rA9fucMHO6X4U6A8e8qFtZyub9j83ICQ/edit# Test: Ran a build with / without RBE. No metrics dumped during lunch without RBE and metrics dumping worked as expected with RBE. Bug: b/197213143 Change-Id: Ic3403331e1f4ac2c7c72fd9169aa7b82a7545c75 --- cmd/soong_ui/main.go | 1 - ui/build/build.go | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/soong_ui/main.go b/cmd/soong_ui/main.go index a0cfbea5d..a03a86a49 100644 --- a/cmd/soong_ui/main.go +++ b/cmd/soong_ui/main.go @@ -221,7 +221,6 @@ func main() { } defer build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, files...) defer met.Dump(soongMetricsFile) - defer build.DumpRBEMetrics(buildCtx, config, rbeMetricsFile) } // Read the time at the starting point. diff --git a/ui/build/build.go b/ui/build/build.go index 2e44aaac6..d261f8947 100644 --- a/ui/build/build.go +++ b/ui/build/build.go @@ -264,6 +264,7 @@ func Build(ctx Context, config Config) { if config.StartRBE() { startRBE(ctx, config) + defer DumpRBEMetrics(ctx, config, filepath.Join(config.LogsDir(), "rbe_metrics.pb")) } if what&RunProductConfig != 0 {