From 0304899bb860b5ee330cec0a52922a52090eb5d9 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 13 Dec 2021 07:10:05 +0100 Subject: pkg/build: increase bazel aquery timeout We've got a timeout of "bazel aquery". It's currently set to 1 minute. On an overloaded machine it can fire falsely, I guess bazel can start only for 1 minute. Increase to 10 minutes. --- pkg/build/gvisor.go | 2 +- pkg/osutil/osutil.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg') diff --git a/pkg/build/gvisor.go b/pkg/build/gvisor.go index d1fafdf77..861fced1b 100644 --- a/pkg/build/gvisor.go +++ b/pkg/build/gvisor.go @@ -74,7 +74,7 @@ func (gvisor gvisor) build(params Params) (ImageDetails, error) { aqueryArgs := append([]string{"aquery"}, args...) aqueryArgs = append(aqueryArgs, fmt.Sprintf("mnemonic(\"GoLink\", %s)", target)) log.Logf(0, "bazel: %v", aqueryArgs) - out, err := osutil.RunCmd(time.Minute, params.KernelDir, params.Compiler, aqueryArgs...) + out, err := osutil.RunCmd(10*time.Minute, params.KernelDir, params.Compiler, aqueryArgs...) if err != nil { return ImageDetails{}, err } diff --git a/pkg/osutil/osutil.go b/pkg/osutil/osutil.go index cbace37c6..0194a616e 100644 --- a/pkg/osutil/osutil.go +++ b/pkg/osutil/osutil.go @@ -62,7 +62,7 @@ func Run(timeout time.Duration, cmd *exec.Cmd) ([]byte, error) { if err != nil { text := fmt.Sprintf("failed to run %q: %v", cmd.Args, err) if <-timedout { - text = fmt.Sprintf("timedout %q", cmd.Args) + text = fmt.Sprintf("timedout after %v %q", timeout, cmd.Args) } exitCode := 0 if exitErr, ok := err.(*exec.ExitError); ok { -- cgit mrf-deployment