diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2021-12-13 07:10:05 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2021-12-13 11:50:21 +0100 |
| commit | 0304899bb860b5ee330cec0a52922a52090eb5d9 (patch) | |
| tree | 2ce1fb4e3a2eac2d410568204f6ac25fc280bb4b /pkg | |
| parent | bac53798526971e822c64b1c1ea675904e4d0244 (diff) | |
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.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/build/gvisor.go | 2 | ||||
| -rw-r--r-- | pkg/osutil/osutil.go | 2 |
2 files changed, 2 insertions, 2 deletions
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 { |