Allow cancelling test runs when detecting flakes
When using --runs_per_tests_detects_flakes, Bazel runs multiple actions
in parallel and aggregates them such that failed runs are ignored if
there is at least one passing run. This change adds a new flag
--experimental_cancel_concurrent_tests, which causes Bazel to cancel any
concurrent actions when the first passing run is observed. This can
reduce the end-to-end build time in case of large flaky tests.
This is only the first half of the implementation. The code path to
interrupt a running action is currently only used to end the entire
build, and does not post a TestResult for the interrupted action. This
leads to confusing command-line reporting of the results.
PiperOrigin-RevId: 275199895
diff --git a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
index 59ab2d8..a6aa223 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/StandaloneTestStrategy.java
@@ -443,7 +443,7 @@
@Override
public TestAttemptContinuation beginExecution() throws InterruptedException, IOException {
- prepareFileSystem(testAction, actionExecutionContext.getExecRoot(), tmpDir, workingDirectory);
+ prepareFileSystem(testAction, execRoot, tmpDir, workingDirectory);
return beginTestAttempt(testAction, spawn, actionExecutionContext, execRoot);
}
diff --git a/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java b/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java
index 797be9d..1ef619c 100644
--- a/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java
+++ b/src/main/java/com/google/devtools/build/lib/exec/TestStrategy.java
@@ -20,7 +20,10 @@
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.io.ByteStreams;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.SettableFuture;
import com.google.devtools.build.lib.actions.ActionExecutionContext;
+import com.google.devtools.build.lib.actions.ActionOwner;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.CommandLineExpansionException;
import com.google.devtools.build.lib.actions.ExecException;
@@ -53,10 +56,14 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.Nullable;
/** A strategy for executing a {@link TestRunnerAction}. */
public abstract class TestStrategy implements TestActionContext {
+ private final ConcurrentHashMap<ShardKey, ListenableFuture<Void>> futures =
+ new ConcurrentHashMap<>();
/**
* Ensures that all directories used to run test are in the correct state and their content will
@@ -147,6 +154,12 @@
return executionOptions.testKeepGoing;
}
+ @Override
+ public final ListenableFuture<Void> getTestCancelFuture(ActionOwner owner, int shardNum) {
+ ShardKey key = new ShardKey(owner, shardNum);
+ return futures.computeIfAbsent(key, (k) -> SettableFuture.<Void>create());
+ }
+
/**
* Generates a command line to run for the test action, taking into account coverage and {@code
* --run_under} settings.
@@ -432,4 +445,31 @@
}
}
}
+
+ private static final class ShardKey {
+ private final ActionOwner owner;
+ private final int shard;
+
+ ShardKey(ActionOwner owner, int shard) {
+ this.owner = Preconditions.checkNotNull(owner);
+ this.shard = shard;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(owner, shard);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof ShardKey)) {
+ return false;
+ }
+ ShardKey s = (ShardKey) o;
+ return owner.equals(s.owner) && shard == s.shard;
+ }
+ }
}
