Add status messages for RBE and product config
RBE adds a lot of time to m nothing builds, so add status messages for it so that it's not misattributed to some other part of the build. Bug: 269644490 Test: m nothing Change-Id: Ifff11bfc88f43b559526f3e3d3022c1388e42156
This commit is contained in:
@@ -84,6 +84,14 @@ func dumpMakeVars(ctx Context, config Config, goals, vars []string, write_soong_
|
||||
ctx.BeginTrace(metrics.RunKati, "dumpvars")
|
||||
defer ctx.EndTrace()
|
||||
|
||||
tool := ctx.Status.StartTool()
|
||||
if write_soong_vars {
|
||||
// only print this when write_soong_vars is true so that it's not printed when using
|
||||
// the get_build_var command.
|
||||
tool.Status("Running product configuration...")
|
||||
}
|
||||
defer tool.Finish()
|
||||
|
||||
cmd := Command(ctx, config, "dumpvars",
|
||||
config.PrebuiltBuildTool("ckati"),
|
||||
"-f", "build/make/core/config.mk",
|
||||
@@ -108,7 +116,7 @@ func dumpMakeVars(ctx Context, config Config, goals, vars []string, write_soong_
|
||||
}
|
||||
cmd.StartOrFatal()
|
||||
// TODO: error out when Stderr contains any content
|
||||
status.KatiReader(ctx.Status.StartTool(), pipe)
|
||||
status.KatiReader(tool, pipe)
|
||||
cmd.WaitOrFatal()
|
||||
|
||||
ret := make(map[string]string, len(vars))
|
||||
|
@@ -100,6 +100,8 @@ func startRBE(ctx Context, config Config) {
|
||||
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)
|
||||
}
|
||||
@@ -180,6 +182,8 @@ func DumpRBEMetrics(ctx Context, config Config, filename string) {
|
||||
return
|
||||
}
|
||||
|
||||
ctx.Status.Status("Dumping rbe metrics...")
|
||||
|
||||
outputDir := config.rbeProxyLogsDir()
|
||||
if outputDir == "" {
|
||||
ctx.Fatal("RBE output dir variable not defined. Aborting metrics dumping.")
|
||||
|
Reference in New Issue
Block a user