aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Beltran <ryanbeltran@chromium.org>2021-03-22 19:30:54 +0000
committerRyan Beltran <ryanbeltran@chromium.org>2021-03-29 21:57:23 +0000
commited23535b4565b70956d5ffaa9eb3758a01b7dc8e (patch)
tree4f914c4020b1e3eb5625beef2315a8dbf06f1927
parente62cc7d4d15e26b71d9a994c95474b3b44ecc136 (diff)
downloadtoolchain-utils-ed23535b4565b70956d5ffaa9eb3758a01b7dc8e.tar.gz
compiler_wrapper: reenable goma w/ rusage
It was determined that INFRA_FAILUREs in unstable builders were caused by timeouts due to disabling Goma with ruage. This CL remedies that by reenabling Goma. BUG=chromium:1193733 TEST=Tested with bb add Change-Id: Id8c2b175da1634916baadd865bb55331fa2dd99b Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2780051 Tested-by: Ryan Beltran <ryanbeltran@chromium.org> Reviewed-by: George Burgess <gbiv@chromium.org> Reviewed-by: Denis Nikitin <denik@chromium.org>
-rw-r--r--compiler_wrapper/compiler_wrapper.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler_wrapper/compiler_wrapper.go b/compiler_wrapper/compiler_wrapper.go
index 2de2f6a4..d2b47691 100644
--- a/compiler_wrapper/compiler_wrapper.go
+++ b/compiler_wrapper/compiler_wrapper.go
@@ -78,8 +78,9 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int
rusageEnabled := isRusageEnabled(env)
- // Disable goma for rusage logs
- allowGoma := !rusageEnabled
+ // Disable CCache for rusage logs
+ // Note: Disabling Goma causes timeout related INFRA_FAILUREs in builders
+ allowGoma := true
allowCCache := !rusageEnabled
workAroundKernelBugWithRetries := false