StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not dump metrics if reproxy was never started

Browse Source 
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
This commit is contained in:
Kousik Kumar
2022-03-18 02:50:31 -04:00
parent 2d6e6a1338
commit a1d8fa9961
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/soong_ui/main.go
View File

@@ -221,7 +221,6 @@ func main() {
} }
defer build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, files...) defer build.UploadMetrics(buildCtx, config, c.simpleOutput, buildStarted, files...)
defer met.Dump(soongMetricsFile) defer met.Dump(soongMetricsFile)
defer build.DumpRBEMetrics(buildCtx, config, rbeMetricsFile)
} }
// Read the time at the starting point. // Read the time at the starting point.

1
ui/build/build.go
View File

@@ -264,6 +264,7 @@ func Build(ctx Context, config Config) {
if config.StartRBE() { if config.StartRBE() {
startRBE(ctx, config) startRBE(ctx, config)
defer DumpRBEMetrics(ctx, config, filepath.Join(config.LogsDir(), "rbe_metrics.pb"))
} }
if what&RunProductConfig != 0 { if what&RunProductConfig != 0 {