Use the number of cores as j value for non goma builds. The j value in the build util was being set to a high value for local builds. This was causing bots to die of resource starvation. Bug: https://github.com/flutter/flutter/issues/127082 Change-Id: I76be56b0bf9785e89e6311aa765da289b4f9eddb Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/44802 Reviewed-by: Ricardo Amador <ricardoamador@google.com> Reviewed-by: Keyong Han <keyonghan@google.com> Commit-Queue: Godofredo Contreras <godofredoc@google.com> (cherry picked from commit 40ef31317bf5a79ffb3813f82f14677ac1ac0df3) Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/45162 Reviewed-by: Drew Roen <drewroen@google.com>
diff --git a/recipe_modules/build_util/api.py b/recipe_modules/build_util/api.py index 28145d0..bdbbcb8 100644 --- a/recipe_modules/build_util/api.py +++ b/recipe_modules/build_util/api.py
@@ -40,6 +40,11 @@ def _calculate_j_value(self): """Calculates concurrent jobs value for the current machine.""" cores = multiprocessing.cpu_count() + + # For non goma builds, set -j to the number of cores. + if not self.use_goma: + return 5 if self._test_data.enabled else cores + # Assume simultaneous multithreading and therefore half as many cores as # logical processors. cores //= 2
diff --git a/recipe_modules/build_util/examples/full.expected/basic.json b/recipe_modules/build_util/examples/full.expected/basic.json index dc6973b..1b049fc 100644 --- a/recipe_modules/build_util/examples/full.expected/basic.json +++ b/recipe_modules/build_util/examples/full.expected/basic.json
@@ -526,7 +526,7 @@ "-C", "[START_DIR]/out/release", "-j", - "200", + "5", "mytarget" ], "env_suffixes": {
diff --git a/recipe_modules/build_util/examples/full.expected/mac.json b/recipe_modules/build_util/examples/full.expected/mac.json index a2cad0b..cc35b52 100644 --- a/recipe_modules/build_util/examples/full.expected/mac.json +++ b/recipe_modules/build_util/examples/full.expected/mac.json
@@ -526,7 +526,7 @@ "-C", "[START_DIR]/out/release", "-j", - "200", + "5", "mytarget" ], "env_suffixes": {
diff --git a/recipe_modules/build_util/examples/full.expected/win.json b/recipe_modules/build_util/examples/full.expected/win.json index e0d40bf..45ed2fe 100644 --- a/recipe_modules/build_util/examples/full.expected/win.json +++ b/recipe_modules/build_util/examples/full.expected/win.json
@@ -537,7 +537,7 @@ "-C", "[START_DIR]\\out/release", "-j", - "200", + "5", "mytarget" ], "env_suffixes": {
diff --git a/recipes/engine/web_engine.expected/basic.json b/recipes/engine/web_engine.expected/basic.json index b35bfee..aa968fc 100644 --- a/recipes/engine/web_engine.expected/basic.json +++ b/recipes/engine/web_engine.expected/basic.json
@@ -519,7 +519,7 @@ "-C", "[CACHE]/builder/src/out/wasm_release", "-j", - "200" + "5" ], "cwd": "[CACHE]/builder", "env": {
diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter.json b/recipes/engine_v2/builder.expected/dart-internal-flutter.json index d3d2a60..97df178 100644 --- a/recipes/engine_v2/builder.expected/dart-internal-flutter.json +++ b/recipes/engine_v2/builder.expected/dart-internal-flutter.json
@@ -375,7 +375,7 @@ "-C", "[CACHE]/builder/src/out/ios_debug", "-j", - "200" + "5" ], "env": { "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",