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

Move startRBE error handling to the main goroutine

Browse Source 
When called from the startRBE goroutine, the panic ctx.Fatalf triggered
by is unhandled and causes the process to exit without cleaning up the
terminal.  Move most of the quick checks to a checkRBERequirements
function called on the main goroutine so they can be reported
immediately before running Soong and Kati, and recover any panics
from startRBE and report them after waiting on rbeCh.

Bug: 293501187
Test: gcertdestroy && m nothing
Change-Id: I62c84c93ab0a7f0e4f2ab2cc64b22e2070dd6e4c
This commit is contained in:
Colin Cross
2023-11-28 14:18:12 -08:00
parent 5ca7b8ed22
commit e7151f971e
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ui/build/build.go
View File

@@ -283,11 +283,16 @@ func Build(ctx Context, config Config) {
}
rbeCh := make(chan bool)
var rbePanic any
if config.StartRBE() {
cleanupRBELogsDir(ctx, config)
checkRBERequirements(ctx, config)
go func() {
defer func() {
rbePanic = recover()
close(rbeCh)
}()
startRBE(ctx, config)
close(rbeCh)
}()
defer DumpRBEMetrics(ctx, config, filepath.Join(config.LogsDir(), "rbe_metrics.pb"))
} else {
@@ -345,6 +350,11 @@ func Build(ctx Context, config Config) {
}
<-rbeCh
if rbePanic != nil {
// If there was a ctx.Fatal in startRBE, rethrow it.
panic(rbePanic)
}
if what&RunNinja != 0 {
if what&RunKati != 0 {
installCleanIfNecessary(ctx, config)

13
ui/build/rbe.go
View File

@@ -95,14 +95,10 @@ func cleanupRBELogsDir(ctx Context, config Config) {
}
}
func startRBE(ctx Context, config Config) {
func checkRBERequirements(ctx Context, config Config) {
if !config.GoogleProdCredsExist() && prodCredsAuthType(config) {
ctx.Fatalf("Unable to start RBE reproxy\nFAILED: Missing LOAS credentials.")
}
ctx.BeginTrace(metrics.RunSetupTool, "rbe_bootstrap")
defer ctx.EndTrace()
ctx.Status.Status("Starting rbe...")
if u := ulimitOrFatal(ctx, config, "-u"); u < rbeLeastNProcs {
ctx.Fatalf("max user processes is insufficient: %d; want >= %d.\n", u, rbeLeastNProcs)
@@ -115,6 +111,13 @@ func startRBE(ctx Context, config Config) {
ctx.Fatalf("Unable to create logs dir (%v) for RBE: %v", config.rbeProxyLogsDir, err)
}
}
}
func startRBE(ctx Context, config Config) {
ctx.BeginTrace(metrics.RunSetupTool, "rbe_bootstrap")
defer ctx.EndTrace()
ctx.Status.Status("Starting rbe...")
cmd := Command(ctx, config, "startRBE bootstrap", rbeCommand(ctx, config, bootstrapCmd))