Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[7.1.0] Flip flag --experimental_use_semaphore_for_jobs. #20646

Merged
merged 2 commits into from
Jan 11, 2024
Merged

[7.1.0] Flip flag --experimental_use_semaphore_for_jobs. #20646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
037b6a9
Flip flag `--experimental_use_semaphore_for_jobs`.
coeuvre Dec 14, 2023
c808ede
Merge branch 'release-7.1.0' into cp20521-7.1.0
meteorcloudy Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/buildtool/BuildRequestOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public class BuildRequestOptions extends OptionsBase {

@Option(
name = "experimental_use_semaphore_for_jobs",
defaultValue = "false",
defaultValue = "true",
documentationCategory = OptionDocumentationCategory.EXECUTION_STRATEGY,
effectTags = {OptionEffectTag.HOST_MACHINE_RESOURCE_OPTIMIZATIONS, OptionEffectTag.EXECUTION},
help = "If set to true, additionally use semaphore to limit number of concurrent jobs.")
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/google/devtools/build/lib/skyframe/rewinding/RewindingTestsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ private void writeNGenrulePackages(int n) throws IOException {
*/
public final void runMultipleLostInputsForRewindPlan() throws Exception {
if (!supportsConcurrentRewinding()) {
testCase.addOptions("--jobs=1", "--experimental_use_semaphore_for_jobs");
testCase.addOptions("--jobs=1");
}
writeNGenrulePackages(ActionRewindStrategy.MAX_ACTION_REWIND_EVENTS + 1);
for (int i = 1; i <= ActionRewindStrategy.MAX_ACTION_REWIND_EVENTS + 1; i++) {
Expand Down
1 change: 0 additions & 1 deletion src/test/shell/bazel/bazel_test_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,6 @@ sh_test(name = "test$i", srcs = [ "test$i.sh" ])
EOF
bazel test --spawn_strategy=standalone \
--jobs=1 \
--experimental_use_semaphore_for_jobs \
--runs_per_test=5 \
--runs_per_test_detects_flakes \
//:test$i &> $TEST_log || fail "should have succeeded"
Expand Down
2 changes: 1 addition & 1 deletion src/test/shell/integration/bazel_testjobs_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ function test_no_local_test_jobs_causes_local_resources_to_constrain_test_execut
function test_local_test_jobs_exceeds_jobs_causes_warning() {
create_test_files
# 10 local test jobs, but only 3 jobs, so warning is printed, and only 3 tests run concurrently
bazel test --jobs=3 --experimental_use_semaphore_for_jobs --local_test_jobs=10 --local_cpu_resources=10 \
bazel test --jobs=3 --local_test_jobs=10 --local_cpu_resources=10 \
--runs_per_test=10 //dir:test >& $TEST_log || fail "Expected success"

expect_log 'High value for --local_test_jobs'
Expand Down
Loading